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

apt module bugfix

Browse source
This commit is contained in:
Matthew Williams 2012-04-03 12:44:53 -07:00
parent 02d5e831ce
commit c819f1715e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/apt
View file

@ -74,14 +74,14 @@ def package_status(pkgspec, cache):
def install(pkgspec, cache, upgrade=False): def install(pkgspec, cache, upgrade=False):
(installed, upgradable) = package_status(pkgspec, cache) (installed, upgradable) = package_status(pkgspec, cache)
if installed or not upgrade or not upgradable: if (not installed) or (upgrade and upgradable):
return False
else:
cmd = "%s -q -y install '%s'" % (APT, pkgspec) cmd = "%s -q -y install '%s'" % (APT, pkgspec)
rc, out, err = run_apt(cmd) rc, out, err = run_apt(cmd)
if rc: if rc:
json_fail(msg="'apt-get install %s' failed: %s" % (pkgspec, err)) json_fail(msg="'apt-get install %s' failed: %s" % (pkgspec, err))
return True return True
else:
return False
def remove(pkgspec, cache, purge=False): def remove(pkgspec, cache, purge=False):
(installed, upgradable) = package_status(pkgspec, cache) (installed, upgradable) = package_status(pkgspec, cache)
@ -128,7 +128,7 @@ if update_cache not in ['yes', 'no']:
if purge not in ['yes', 'no']: if purge not in ['yes', 'no']:
fail_json(msg='invalid value for purge (requires yes or no -- default is no)') fail_json(msg='invalid value for purge (requires yes or no -- default is no)')
if package is None and update-cache != 'yes': if package is None and update_cache != 'yes':
fail_json(msg='pkg=name and/or update-cache=yes is required') fail_json(msg='pkg=name and/or update-cache=yes is required')
cache = apt.Cache() cache = apt.Cache()
@ -136,6 +136,8 @@ cache = apt.Cache()
if update_cache == 'yes': if update_cache == 'yes':
cache.update() cache.update()
cache.open() cache.open()
if package == None:
exit_json(changed=False)
if state == 'latest': if state == 'latest':
changed = install(package, cache, upgrade=True) changed = install(package, cache, upgrade=True)