gsutil: don't warn/log if ~/.gsutil doesn't exist to clean

Make errors less chatty in builders.

Bug: b/285376658
Change-Id: I9ffda16e97900d0a3bbc27b588ce9806a73780ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4582290
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
changes/90/4582290/4
Mike Frysinger 3 years ago committed by LUCI CQ
parent 6d5fa4a45e
commit 9e0ff22bfb

@ -51,13 +51,16 @@ def main(argv):
' '.join(cmd), retcode, hard+1, soft+1))
# Failed at least once, try deleting the tracker files
logging.warning('Trying harder: deleting tracker files')
gsutil_dir = os.path.expanduser('~/.gsutil')
logging.info('Removing %s' % gsutil_dir)
try:
shutil.rmtree(gsutil_dir)
except BaseException as e:
logging.warning('Deleting tracker files failed: %s' % e)
if os.path.exists(gsutil_dir):
logging.warning('Trying harder: deleting tracker files')
logging.info('Removing %s' % gsutil_dir)
try:
shutil.rmtree(gsutil_dir)
except FileNotFoundError:
pass
except BaseException as e:
logging.warning('Deleting tracker files failed: %s' % e)
logging.error('Command %s failed %d retries, giving up.' % (
' '.join(args.command), args.soft_retries*args.hard_retries))

Loading…
Cancel
Save