diff options
| author | Alexander Winkler <mail@winkler-alexander.de> | 2015-12-29 08:02:13 +0100 |
|---|---|---|
| committer | Alexander Winkler <mail@winkler-alexander.de> | 2015-12-29 08:02:13 +0100 |
| commit | 389a1265dee4c804740cf1928c24cb0661d9f670 (patch) | |
| tree | 3f21a20128a7fad60be2ee7354a243b65684e151 /packaging/os | |
| parent | 2586541ba13867c88d227ee00e2a3f8c611f911c (diff) | |
| download | ansible-modules-extras-389a1265dee4c804740cf1928c24cb0661d9f670.tar.gz | |
fixed inline for more compatibility
Diffstat (limited to 'packaging/os')
| -rw-r--r-- | packaging/os/pkgutil.py | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/packaging/os/pkgutil.py b/packaging/os/pkgutil.py index 05d0b173..275fa35f 100644 --- a/packaging/os/pkgutil.py +++ b/packaging/os/pkgutil.py @@ -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 |