From 07d6e6985b4b6c544c0e46bf4290dc41d51a4225 Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 8 Sep 2022 01:49:38 +0000 Subject: [PATCH] Use shutil when moving gsutil. Bug:b/242209562 Change-Id: Icdb145c15fe6f4fc2a61fe3342e0dd495b972b14 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3879825 Commit-Queue: Joanna Wang Reviewed-by: Josip Sokcevic --- gsutil.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gsutil.py b/gsutil.py index 876ecac8d..4b2867b06 100755 --- a/gsutil.py +++ b/gsutil.py @@ -127,11 +127,7 @@ def ensure_gsutil(version, target, clean): with zipfile.ZipFile(target_zip_filename, 'r') as target_zip: target_zip.extractall(download_dir) - try: - os.rename(download_dir, bin_dir) - except (OSError, IOError): - # Something else did this in parallel. - pass + shutil.move(download_dir, bin_dir) # Final check that the gsutil bin exists. This should never fail. if not os.path.isfile(gsutil_bin): raise InvalidGsutilError()