gsutil: move unnecessary logic out of try block

The logging & path expansion shouldn't trigger exceptions, so move
them out of the try block to reduce the scope for this.

Bug: b/285376658
Change-Id: I617d572d997f8eaafa222cdb6c1d984c459d9733
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4582289
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
changes/89/4582289/2
Mike Frysinger 2 years ago committed by LUCI CQ
parent d8670c5709
commit 6d5fa4a45e

@ -51,10 +51,10 @@ 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:
logging.warning('Trying harder: deleting tracker files')
gsutil_dir = os.path.expanduser('~/.gsutil')
logging.info('Removing %s' % gsutil_dir)
shutil.rmtree(gsutil_dir)
except BaseException as e:
logging.warning('Deleting tracker files failed: %s' % e)

Loading…
Cancel
Save