commit 07d6e6985b4b6c544c0e46bf4290dc41d51a4225
author Joanna Wang <jojwang@chromium.org> Thu Sep 08 01:49:38 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 08 01:49:38 2022 +0000
tree c401b4ec04d7d9c2c58fad4e7ebbaa421bfa3819
parent e3d0dd30d3169cf5bb44ffd71338416bfb456276

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 <jojwang@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>

gsutil.py

diff --git a/gsutil.py b/gsutil.py
index 876ecac..4b2867b 100755
--- a/gsutil.py
+++ b/gsutil.py
@@ -127,11 +127,7 @@
     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()