From 6d5fa4a45ef5565290f9e83e9c77a6180c455c21 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 2 Jun 2023 00:35:55 +0000 Subject: [PATCH] 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 Reviewed-by: Joanna Wang --- .../recipe_modules/gsutil/resources/gsutil_smart_retry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/recipe_modules/gsutil/resources/gsutil_smart_retry.py b/recipes/recipe_modules/gsutil/resources/gsutil_smart_retry.py index c56c269924..16d6c1f796 100755 --- a/recipes/recipe_modules/gsutil/resources/gsutil_smart_retry.py +++ b/recipes/recipe_modules/gsutil/resources/gsutil_smart_retry.py @@ -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)