habsi/ansible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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


(cherry picked from commit 2e68811c34)

* Add changelog/fragment
This commit is contained in:
Martin Krizek
2018-07-03 21:01:36 +02:00
committed by Matt Davis
parent 36b0756c3b
commit dcf95a3adc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/41530-apt-mark-deb6.yaml Normal file
View File

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

3
lib/ansible/modules/packaging/os/apt.py
View File

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