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

Merge pull request #4138 from resmo/fix/redundant-fail-json

Browse source 
apt: fixed duplicate fail_json
This commit is contained in:
James Cammarata 2013-09-17 06:08:51 -07:00
commit a6e339fc36
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/apt
View file

@ -299,7 +299,6 @@ def upgrade(m, mode="yes", force=False):
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))
m.fail_json(msg="'aptitude safe-upgrade' failed: %s" % err)
if (apt_cmd == APT_GET_CMD and APT_GET_ZERO in out) or (apt_cmd == APTITUDE_CMD and APTITUDE_ZERO in out): if (apt_cmd == APT_GET_CMD and APT_GET_ZERO in out) or (apt_cmd == APTITUDE_CMD and APTITUDE_ZERO in out):
m.exit_json(changed=False, msg=out) m.exit_json(changed=False, msg=out)
m.exit_json(changed=True, msg=out) m.exit_json(changed=True, msg=out)