From d48cbf93453624f7258052ab4e7140d0984ba0b5 Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Tue, 24 Sep 2019 22:40:01 +0000 Subject: [PATCH] Revert "depot_tools: Use vpython to execute fetch." This reverts commit 028367fe4a43d8e38fc34649865d65bec632925a. Reason for revert: Original change's description: > depot_tools: Use vpython to execute fetch. > > Bug: 1002153 > Change-Id: I11286bebc23bedada239d6ddb8ebb86207a41485 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1815707 > Reviewed-by: Anthony Polito > Commit-Queue: Edward Lesmes > Auto-Submit: Edward Lesmes TBR=tandrii@google.com,ehmaldonado@chromium.org,apolito@google.com Change-Id: I0924e77a3862b8a75195db7fe719286e1cb3ac7e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1002153 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1824217 Reviewed-by: Edward Lesmes Commit-Queue: Edward Lesmes --- fetch | 6 +----- fetch.bat | 2 +- fetch.py | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fetch b/fetch index 14a142791..bea6718c7 100755 --- a/fetch +++ b/fetch @@ -5,8 +5,4 @@ base_dir=$(dirname "$0") -# Ensure that "depot_tools" is somewhere in PATH so this tool can be used -# standalone, but allow other PATH manipulations to take priority. -PATH=$PATH:$base_dir - -PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@" +PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@" diff --git a/fetch.bat b/fetch.bat index 6afd53092..5f8019a19 100755 --- a/fetch.bat +++ b/fetch.bat @@ -12,4 +12,4 @@ call "%~dp0\update_depot_tools.bat" set PATH=%PATH%;%~dp0 :: Defer control. -vpython "%~dp0\fetch.py" %* +python "%~dp0\fetch.py" %* diff --git a/fetch.py b/fetch.py index 72e52c796..56abfb9a6 100755 --- a/fetch.py +++ b/fetch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env vpython +#!/usr/bin/env python # Copyright (c) 2013 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file.