ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

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

Browse source
This commit is contained in:
Martin Krizek 2018-06-20 11:57:59 +02:00 committed by ansibot
parent 543a7469b7
commit 2e68811c34
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,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'
CLEAN_OP_CHANGED_STR = dict( CLEAN_OP_CHANGED_STR = dict(
autoremove='The following packages will be REMOVED', autoremove='The following packages will be REMOVED',
@ -502,7 +503,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)