mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fixes #5369 Do not pass --force-yes to aptitude
This commit is contained in:
parent
dee960716b
commit
c8bd14925d
1 changed files with 5 additions and 1 deletions
|
@ -324,13 +324,17 @@ def upgrade(m, mode="yes", force=False,
|
|||
upgrade_command = "safe-upgrade"
|
||||
|
||||
if force:
|
||||
force_yes = '--force-yes'
|
||||
if apt_cmd == APT_GET_CMD:
|
||||
force_yes = '--force-yes'
|
||||
else:
|
||||
force_yes = ''
|
||||
else:
|
||||
force_yes = ''
|
||||
|
||||
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,
|
||||
force_yes, check_arg, upgrade_command)
|
||||
open("/tmp/awx.log", "a").write("cmd: %s\n" % cmd)
|
||||
rc, out, err = m.run_command(cmd)
|
||||
if rc:
|
||||
m.fail_json(msg="'%s %s' failed: %s" % (apt_cmd, upgrade_command, err), stdout=out)
|
||||
|
|
Loading…
Reference in a new issue