Backport typo fix from integration branch for apt module error path.

reviewable/pr18780/r1
Michael DeHaan 13 years ago
parent f2d9169672
commit bc06a49850

4
apt

@ -76,7 +76,7 @@ def install(pkgspec, cache, upgrade=False):
cmd = "%s -q -y install '%s'" % (APT, pkgspec)
rc, out, err = run_apt(cmd)
if rc:
json_fail(msg="'apt-get install %s' failed: %s" % (pkgspec, err))
fail_json(msg="'apt-get install %s' failed: %s" % (pkgspec, err))
return True
else:
return False
@ -90,7 +90,7 @@ def remove(pkgspec, cache, purge=False):
cmd = "%s -q -y %s remove '%s'" % (APT, purge, pkgspec)
rc, out, err = run_apt(cmd)
if rc:
json_fail(msg="'apt-get remove %s' failed: %s" % (pkgspec, err))
fail_json(msg="'apt-get remove %s' failed: %s" % (pkgspec, err))
return True

Loading…
Cancel
Save