cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use the force=yes option for apt upgrade actions

Browse source
This commit is contained in:
Felix Stuermer 2013-07-09 10:57:19 +02:00
parent 714cb02f5b
commit b5df29901f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/packaging/apt
View file

@ -228,7 +228,7 @@ def remove(m, pkgspec, cache, purge=False):
m.fail_json(msg="'apt-get remove %s' failed: %s" % (packages, err)) m.fail_json(msg="'apt-get remove %s' failed: %s" % (packages, err))
m.exit_json(changed=True) m.exit_json(changed=True)
def upgrade(m, mode="yes"): def upgrade(m, mode="yes", force=False):
if m.check_mode: if m.check_mode:
check_arg = '--simulate' check_arg = '--simulate'
else: else:
@ -246,9 +246,14 @@ def upgrade(m, mode="yes"):
apt_cmd = APTITUDE_CMD apt_cmd = APTITUDE_CMD
upgrade_command = "safe-upgrade" upgrade_command = "safe-upgrade"
if force:
force_yes = '--force-yes'
else:
force_yes = ''
apt_cmd_path = m.get_bin_path(apt_cmd, required=True) apt_cmd_path = m.get_bin_path(apt_cmd, required=True)
cmd = '%s %s -y %s %s %s' % (APT_ENVVARS, apt_cmd_path, DPKG_OPTIONS, cmd = '%s %s -y %s %s %s %s' % (APT_ENVVARS, apt_cmd_path, DPKG_OPTIONS,
check_arg, upgrade_command) force_yes, check_arg, upgrade_command)
rc, out, err = m.run_command(cmd) rc, out, err = m.run_command(cmd)
if rc: if rc:
m.fail_json(msg="'%s %s' failed: %s" % (apt_cmd, upgrade_command, err)) m.fail_json(msg="'%s %s' failed: %s" % (apt_cmd, upgrade_command, err))
@ -332,7 +337,7 @@ def main():
force_yes = p['force'] force_yes = p['force']
if p['upgrade']: if p['upgrade']:
upgrade(module, p['upgrade']) upgrade(module, p['upgrade'], force_yes)
packages = p['package'].split(',') packages = p['package'].split(',')
latest = p['state'] == 'latest' latest = p['state'] == 'latest'