apt: better error msg when update_cache fails (#37410)

This commit is contained in:
Martin Krizek 2018-03-15 17:32:25 +01:00 committed by GitHub
parent 6292fe1116
commit a6d31b6fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions

View file

@ -956,14 +956,15 @@ def main():
tdelta = datetime.timedelta(seconds=p['cache_valid_time'])
if not mtimestamp + tdelta >= now:
# Retry to update the cache up to 3 times
err = ''
for retry in range(3):
try:
cache.update()
break
except apt.cache.FetchFailedException:
pass
except apt.cache.FetchFailedException as e:
err = to_native(e)
else:
module.fail_json(msg='Failed to update apt cache.')
module.fail_json(msg='Failed to update apt cache: %s' % err)
cache.open(progress=None)
updated_cache = True
mtimestamp, updated_cache_time = get_updated_cache_time()