浏览代码

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 <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Edward Lemur 5 年之前
父节点
当前提交
028367fe4a
共有 3 个文件被更改,包括 7 次插入3 次删除
  1. 5 1
      fetch
  2. 1 1
      fetch.bat
  3. 1 1
      fetch.py

+ 5 - 1
fetch

@@ -5,4 +5,8 @@
 
 
 base_dir=$(dirname "$0")
 base_dir=$(dirname "$0")
 
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@"
+# 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" "$@"

+ 1 - 1
fetch.bat

@@ -12,4 +12,4 @@ call "%~dp0\update_depot_tools.bat"
 set PATH=%PATH%;%~dp0
 set PATH=%PATH%;%~dp0
 
 
 :: Defer control.
 :: Defer control.
-python "%~dp0\fetch.py" %*
+vpython "%~dp0\fetch.py" %*

+ 1 - 1
fetch.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # found in the LICENSE file.