ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

pkgin: display stdout and stderr in case the error occurs (#3148) (#3156)

Browse source 
* pkgin: display stdout and stderr in case the error occurs

* Update changelogs/fragments/pkgin-output-after-error.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit ff586f1105)

Co-authored-by: Bartosz <8199062+bartoszkosiorek@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2021-08-06 10:22:54 +02:00 committed by GitHub
parent c461e3cf71
commit 9e7bcae370
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/pkgin-output-after-error.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- pkgin - in case of ``pkgin`` tool failue, display returned standard output ``stdout`` and standard error ``stderr`` to ease debugging (https://github.com/ansible-collections/community.general/issues/3146).

12
plugins/modules/packaging/os/pkgin.py
View file

@ -251,7 +251,7 @@ def remove_packages(module, packages):
format_pkgin_command(module, "remove", package)) format_pkgin_command(module, "remove", package))
if not module.check_mode and query_package(module, package) in [PackageState.PRESENT, PackageState.OUTDATED]: if not module.check_mode and query_package(module, package) in [PackageState.PRESENT, PackageState.OUTDATED]:
module.fail_json(msg="failed to remove %s: %s" % (package, out)) module.fail_json(msg="failed to remove %s: %s" % (package, out), stdout=out, stderr=err)
remove_c += 1 remove_c += 1
@ -276,14 +276,14 @@ def install_packages(module, packages):
format_pkgin_command(module, "install", package)) format_pkgin_command(module, "install", package))
if not module.check_mode and not query_package(module, package) in [PackageState.PRESENT, PackageState.OUTDATED]: if not module.check_mode and not query_package(module, package) in [PackageState.PRESENT, PackageState.OUTDATED]:
module.fail_json(msg="failed to install %s: %s" % (package, out)) module.fail_json(msg="failed to install %s: %s" % (package, out), stdout=out, stderr=err)
install_c += 1 install_c += 1
if install_c > 0: if install_c > 0:
module.exit_json(changed=True, msg=format_action_message(module, "installed", install_c)) module.exit_json(changed=True, msg=format_action_message(module, "installed", install_c))
module.exit_json(changed=False, msg="package(s) already present") module.exit_json(changed=False, msg="package(s) already present", stdout=out, stderr=err)
def update_package_db(module): def update_package_db(module):
@ -296,7 +296,7 @@ def update_package_db(module):
else: else:
return True, "updated repository database" return True, "updated repository database"
else: else:
module.fail_json(msg="could not update package db") module.fail_json(msg="could not update package db", stdout=out, stderr=err)
def do_upgrade_packages(module, full=False): def do_upgrade_packages(module, full=False):
@ -312,7 +312,7 @@ def do_upgrade_packages(module, full=False):
if re.search('^nothing to do.\n$', out): if re.search('^nothing to do.\n$', out):
module.exit_json(changed=False, msg="nothing left to upgrade") module.exit_json(changed=False, msg="nothing left to upgrade")
else: else:
module.fail_json(msg="could not %s packages" % cmd) module.fail_json(msg="could not %s packages" % cmd, stdout=out, stderr=err)
def upgrade_packages(module): def upgrade_packages(module):
@ -332,7 +332,7 @@ def clean_cache(module):
# so assume it did. # so assume it did.
module.exit_json(changed=True, msg="cleaned caches") module.exit_json(changed=True, msg="cleaned caches")
else: else:
module.fail_json(msg="could not clean package cache") module.fail_json(msg="could not clean package cache", stdout=out, stderr=err)
def main(): def main():