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

fixed inline for more compatibility

Browse source
This commit is contained in:
Alexander Winkler 2015-12-29 08:02:13 +01:00
parent 2586541ba1
commit 389a1265de
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
packaging/os/pkgutil.py
View file

@ -155,7 +155,11 @@ def main():
if len(out) > 75:
out = out[:75] + '...'
if rc != 0:
module.fail_json(msg=err if err else out)
if err:
msg = err
else:
msg = out
module.fail_json(msg=msg)
elif state == 'latest':
if not package_installed(module, name):
@ -165,7 +169,12 @@ def main():
if len(out) > 75:
out = out[:75] + '...'
if rc != 0:
module.fail_json(msg=err if err else out)
if err:
msg = err
else:
msg = out
module.fail_json(msg=msg)
else:
if not package_latest(module, name, site):
if module.check_mode:
@ -174,7 +183,11 @@ def main():
if len(out) > 75:
out = out[:75] + '...'
if rc != 0:
module.fail_json(msg=err if err else out)
if err:
msg = err
else:
msg = out
module.fail_json(msg=msg)
elif state == 'absent':
if package_installed(module, name):
@ -184,7 +197,11 @@ def main():
if len(out) > 75:
out = out[:75] + '...'
if rc != 0:
module.fail_json(msg=err if err else out)
if err:
msg = err
else:
msg = out
module.fail_json(msg=msg)
if rc is None:
# pkgutil was not executed because the package was already present/absent