Revert "[gsutil] run through "vpython""
This reverts commit 23836a643f480b21e91340f2f9845619ebf6f9c4.
Reason for revert: This is breaking all the chromecast builders.
Original change's description:
> [gsutil] run through "vpython"
>
> Run "gsutil" through "vpython". This ensures that the package set
> accompanying it is completely controlled. This is notably important on
> GCE instances, which "gsutil" expects to supply a
> "google_compute_engine" package.
>
> BUG=None
> TEST=local
> - Ran `gsutil cp` on 64-bit Linux machine, seems to work.
> - Ran `gsutil cp` on GCE instance, seems to work.
>
> Change-Id: Id771bc4da4de22c941b0ace4031cb0f3364feeeb
> Reviewed-on: https://chromium-review.googlesource.com/527277
> Reviewed-by: Nodir Turakulov <nodir@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Daniel Jacques <dnj@chromium.org>
TBR=iannucci@chromium.org,dnj@chromium.org,nodir@chromium.org
Change-Id: Ifc3d6389720abd0fb9e3fc83c0cdd5a63b5ff94d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/656358
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
diff --git a/gsutil.py b/gsutil.py
index eb339bc..d57cafb 100755
--- a/gsutil.py
+++ b/gsutil.py
@@ -29,9 +29,6 @@
DEFAULT_FALLBACK_GSUTIL = os.path.join(
THIS_DIR, 'third_party', 'gsutil', 'gsutil')
-IS_WINDOWS = os.name == 'nt'
-
-
class InvalidGsutilError(Exception):
pass
@@ -129,17 +126,8 @@
else:
gsutil_bin = fallback
disable_update = ['-o', 'GSUtil:software_update_check_period=0']
-
- # Run "gsutil" through "vpython". We need to do this because on GCE instances,
- # expectations are made about Python having access to "google-compute-engine"
- # and "boto" packages that are not met with non-system Python (e.g., bundles).
- cmd = [
- 'vpython',
- '-vpython-spec', os.path.join(THIS_DIR, 'gsutil.vpython'),
- '--',
- gsutil_bin
- ] + disable_update + args
- return subprocess.call(cmd, shell=IS_WINDOWS)
+ cmd = [sys.executable, gsutil_bin] + disable_update + args
+ return subprocess.call(cmd)
def parse_args():