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

apt: fixed duplicate fail_json
11 years ago · a6e339fc36
parent a17610f7c6 8c7c0833c2
commit a6e339fc36
1 changed files with 0 additions and 1 deletions
--- a/packaging/apt
+++ b/packaging/apt
@ -299,7 +299,6 @@ def upgrade(m, mode="yes", force=False):
    rc, out, err = m.run_command(cmd)
    if rc:
        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):
        m.exit_json(changed=False, msg=out)
    m.exit_json(changed=True, msg=out)