commit b65bfd53b7ce251cf5f641e7803b165479c14154
author Josip Sokcevic <sokcevic@google.com> Wed Mar 02 23:21:17 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 02 23:21:17 2022 +0000
tree d6fd67b7f210800fe65abf733abd3c463a4754ce
parent 4ee32ce4cbab9f81f14109a108507bbca3d0e707

Revert "Update gsutil to use gsutil version 5.6, python3"

This reverts commit c0af61c8dd0fee6a483aacbf64a57d46ba80355e.

Reason for revert: blocked on https://crrev.com/c/3440919

Original change's description:
> Update gsutil to use gsutil version 5.6, python3
>
> R=​gavinmak@google.com
>
> Bug: 1184108
> Change-Id: I933c07132006b731a97153080ebe86ed756fbdb2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3497998
> Reviewed-by: Gavin Mak <gavinmak@google.com>
> Commit-Queue: Josip Sokcevic <sokcevic@google.com>

Bug: 1184108
Change-Id: Ifd553d12fcc25230de5ba9e6c32c8e5190cf01a8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3500910
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>

gsutil.py

diff --git a/gsutil.py b/gsutil.py
index 90265cf..61aaafe 100755
--- a/gsutil.py
+++ b/gsutil.py
@@ -34,7 +34,7 @@
 
 IS_WINDOWS = os.name == 'nt'
 
-VERSION = '5.6'
+VERSION = '4.28'
 
 
 class InvalidGsutilError(Exception):
@@ -166,7 +166,9 @@
   assert sys.platform != 'cygwin'
 
   cmd = [
-      sys.executable,
+      'vpython',
+      '-vpython-spec', os.path.join(THIS_DIR, 'gsutil.vpython'),
+      '--',
       gsutil_bin
   ] + args_opt + args
   return subprocess.call(cmd, shell=IS_WINDOWS)