Backport 2.5: apt: fix apt-mark on debian6 (#41724)

* apt: fix apt-mark on debian6 (#41530)


(cherry picked from commit 2e68811c34)

* Add changelog/fragment
pull/42207/head
Martin Krizek 6 years ago committed by Matt Davis
parent 36b0756c3b
commit dcf95a3adc

@ -0,0 +1,2 @@
bugfixes:
- apt: fix apt-mark on debian6 (https://github.com/ansible/ansible/pull/41530)

@ -275,6 +275,7 @@ APTITUDE_ZERO = "\n0 packages upgraded, 0 newly installed"
APT_LISTS_PATH = "/var/lib/apt/lists" APT_LISTS_PATH = "/var/lib/apt/lists"
APT_UPDATE_SUCCESS_STAMP_PATH = "/var/lib/apt/periodic/update-success-stamp" APT_UPDATE_SUCCESS_STAMP_PATH = "/var/lib/apt/periodic/update-success-stamp"
APT_MARK_INVALID_OP = 'Invalid operation' APT_MARK_INVALID_OP = 'Invalid operation'
APT_MARK_INVALID_OP_DEB6 = 'Usage: apt-mark [options] {markauto|unmarkauto} packages'
HAS_PYTHON_APT = True HAS_PYTHON_APT = True
try: try:
@ -483,7 +484,7 @@ def mark_installed_manually(m, packages):
cmd = "%s manual %s" % (apt_mark_cmd_path, ' '.join(packages)) cmd = "%s manual %s" % (apt_mark_cmd_path, ' '.join(packages))
rc, out, err = m.run_command(cmd) rc, out, err = m.run_command(cmd)
if APT_MARK_INVALID_OP in err: if APT_MARK_INVALID_OP in err or APT_MARK_INVALID_OP_DEB6 in err:
cmd = "%s unmarkauto %s" % (apt_mark_cmd_path, ' '.join(packages)) cmd = "%s unmarkauto %s" % (apt_mark_cmd_path, ' '.join(packages))
rc, out, err = m.run_command(cmd) rc, out, err = m.run_command(cmd)

Loading…
Cancel
Save