internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix packaging/os modules for wildcard imports and get_exception

Browse Source
This commit is contained in:
Toshio Kuratomi
2018-02-01 16:30:08 -08:00
parent 5c50720325
commit a5b80464df
17 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/modules/packaging/os/apt.py
View File

@@ -841,7 +841,7 @@ def get_cache(module):
try:
cache = apt.Cache()
except SystemError as e:
if '/var/lib/apt/lists/' in str(e).lower():
if '/var/lib/apt/lists/' in to_native(e).lower():
# update cache until files are fixed or retries exceeded
retries = 0
while retries < 2:
@@ -850,7 +850,7 @@ def get_cache(module):
if rc == 0:
break
if rc != 0:
module.fail_json(msg='Updating the cache to correct corrupt package lists failed:\n%s\n%s' % (str(e), str(so) + str(se)), rc=rc)
module.fail_json(msg='Updating the cache to correct corrupt package lists failed:\n%s\n%s' % (to_native(e), so + se), rc=rc)
# try again
cache = apt.Cache()
else: