[stable-2.10] apt - make errors more transparent (#70099) (#70478)

Include error from apt Python library in module error output

Co-authored-by: Andreas Schleifer <aschleifer@bigpoint.net>
(cherry picked from commit 7d7f15fc9b)

Co-authored-by: Andreas Schleifer <a.schleifer@bigpoint.net>

Co-authored-by: Andreas Schleifer <a.schleifer@bigpoint.net>
This commit is contained in:
Sam Doran 2020-07-17 15:43:19 -04:00 committed by GitHub
parent df3246b7d1
commit 422e976649
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- apt - include exception message from apt python library in error output

View file

@ -1219,10 +1219,10 @@ def main():
elif p['state'] == 'absent': elif p['state'] == 'absent':
remove(module, packages, cache, p['purge'], force=force_yes, dpkg_options=dpkg_options, autoremove=autoremove) remove(module, packages, cache, p['purge'], force=force_yes, dpkg_options=dpkg_options, autoremove=autoremove)
except apt.cache.LockFailedException: except apt.cache.LockFailedException as lockFailedException:
module.fail_json(msg="Failed to lock apt for exclusive operation") module.fail_json(msg="Failed to lock apt for exclusive operation: %s" % lockFailedException)
except apt.cache.FetchFailedException: except apt.cache.FetchFailedException as fetchFailedException:
module.fail_json(msg="Could not fetch updated apt files") module.fail_json(msg="Could not fetch updated apt files: %s" % fetchFailedException)
if __name__ == "__main__": if __name__ == "__main__":