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

better handling of deprecated aliases

Browse source
This commit is contained in:
Brian Coca 2014-11-12 17:01:14 -05:00
parent 5356ccbb35
commit bbebdefacb
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packaging/os/apt.py
View file

@ -469,6 +469,12 @@ def main():
install_recommends = p['install_recommends'] install_recommends = p['install_recommends']
dpkg_options = expand_dpkg_options(p['dpkg_options']) dpkg_options = expand_dpkg_options(p['dpkg_options'])
# Deal with deprecated aliases
if p['state'] == 'installed':
p['state'] = 'present'
if p['state'] == 'removed':
p['state'] = 'absent'
try: try:
cache = apt.Cache() cache = apt.Cache()
if p['default_release']: if p['default_release']:
@ -519,7 +525,7 @@ def main():
p['default_release'], dpkg_options) p['default_release'], dpkg_options)
if p['deb']: if p['deb']:
if p['state'] not in ["installed", "present"]: if p['state'] == 'present':
module.fail_json(msg="deb only supports state=present") module.fail_json(msg="deb only supports state=present")
install_deb(module, p['deb'], cache, install_deb(module, p['deb'], cache,
install_recommends=install_recommends, install_recommends=install_recommends,
@ -543,7 +549,7 @@ def main():
module.exit_json(**retvals) module.exit_json(**retvals)
else: else:
module.fail_json(**retvals) module.fail_json(**retvals)
elif p['state'] in [ 'installed', 'present' ]: elif p['state'] == 'present':
result = install(module, packages, cache, default_release=p['default_release'], result = install(module, packages, cache, default_release=p['default_release'],
install_recommends=install_recommends,force=force_yes, install_recommends=install_recommends,force=force_yes,
dpkg_options=dpkg_options) dpkg_options=dpkg_options)
@ -552,7 +558,7 @@ def main():
module.exit_json(**retvals) module.exit_json(**retvals)
else: else:
module.fail_json(**retvals) module.fail_json(**retvals)
elif p['state'] in [ 'removed', 'absent' ]: elif p['state'] == 'absent':
remove(module, packages, cache, p['purge'], dpkg_options) remove(module, packages, cache, p['purge'], dpkg_options)
except apt.cache.LockFailedException: except apt.cache.LockFailedException: