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

Merge pull request #1018 from indrajitr/pacman-checkmode-fixes

Browse source 
Additional upgrade mode fixes for pacman module with check_mode safety
This commit is contained in:
Greg DeKoenigsberg 2015-09-30 16:23:18 -04:00
commit 8e9299653a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packaging/os/pacman.py
View file

@ -102,6 +102,9 @@ EXAMPLES = '''
# Run the equivalent of "pacman -Su" as a separate step # Run the equivalent of "pacman -Su" as a separate step
- pacman: upgrade=yes - pacman: upgrade=yes
# Run the equivalent of "pacman -Syu" as a separate step
- pacman: update_cache=yes upgrade=yes
# Run the equivalent of "pacman -Rdd", force remove package baz # Run the equivalent of "pacman -Rdd", force remove package baz
- pacman: name=baz state=absent force=yes - pacman: name=baz state=absent force=yes
''' '''
@ -160,11 +163,14 @@ def upgrade(module, pacman_path):
rc, stdout, stderr = module.run_command(cmdneedrefresh, check_rc=False) rc, stdout, stderr = module.run_command(cmdneedrefresh, check_rc=False)
if rc == 0: if rc == 0:
if module.check_mode:
data = stdout.split('\n')
module.exit_json(changed=True, msg="%s package(s) would be upgraded" % len(data))
rc, stdout, stderr = module.run_command(cmdupgrade, check_rc=False) rc, stdout, stderr = module.run_command(cmdupgrade, check_rc=False)
if rc == 0: if rc == 0:
module.exit_json(changed=True, msg='System upgraded') module.exit_json(changed=True, msg='System upgraded')
else: else:
module.fail_json(msg="could not upgrade") module.fail_json(msg="Could not upgrade")
else: else:
module.exit_json(changed=False, msg='Nothing to upgrade') module.exit_json(changed=False, msg='Nothing to upgrade')
@ -276,10 +282,10 @@ def main():
if p["update_cache"] and not module.check_mode: if p["update_cache"] and not module.check_mode:
update_package_db(module, pacman_path) update_package_db(module, pacman_path)
if not p['name']: if not (p['name'] or p['upgrade']):
module.exit_json(changed=True, msg='updated the package master lists') module.exit_json(changed=True, msg='Updated the package master lists')
if p['update_cache'] and module.check_mode and not p['name']: if p['update_cache'] and module.check_mode and not (p['name'] or p['upgrade']):
module.exit_json(changed=True, msg='Would have updated the package cache') module.exit_json(changed=True, msg='Would have updated the package cache')
if p['upgrade']: if p['upgrade']: