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

Fixes #5369 Do not pass --force-yes to aptitude

Browse source
This commit is contained in:
James Tanner 2014-01-07 14:43:22 -05:00
parent dee960716b
commit c8bd14925d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/packaging/apt
View file

@ -324,13 +324,17 @@ def upgrade(m, mode="yes", force=False,
upgrade_command = "safe-upgrade" upgrade_command = "safe-upgrade"
if force: if force:
force_yes = '--force-yes' if apt_cmd == APT_GET_CMD:
force_yes = '--force-yes'
else:
force_yes = ''
else: else:
force_yes = '' 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 %s' % (APT_ENVVARS, apt_cmd_path, dpkg_options, cmd = '%s %s -y %s %s %s %s' % (APT_ENVVARS, apt_cmd_path, dpkg_options,
force_yes, check_arg, upgrade_command) force_yes, check_arg, upgrade_command)
open("/tmp/awx.log", "a").write("cmd: %s\n" % cmd)
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), stdout=out) m.fail_json(msg="'%s %s' failed: %s" % (apt_cmd, upgrade_command, err), stdout=out)