InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

depot_tools: Use system's python for vpython.

Browse Source 
Using bootstrapped vpython causes problems like [1] when used on
platforms it was not compiled for (e.g. Fedora).

[1] https://chromium-review.googlesource.com/c/infra/infra/+/1929031

Change-Id: I4e62cd1a4e13eee58143695f54ecf80d3473a862
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1930181
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Edward Lemur
2019-11-25 19:00:32 +00:00
committed by Commit Bot
parent 800129711d
commit 0ab6a9f6e4
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vpython
View File

@@ -39,15 +39,4 @@ base_dir=$(dirname "$0")
source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null
# If Python bootstrapping is not disabled, make sure Python has been
# bootstrapped and add it to the front of PATH.
if [[ $MINGW != 0 && $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
if [[ ! -e $base_dir/python_bin_reldir.txt ]]; then
source "$base_dir/bootstrap_python3"
bootstrap_python3
fi
PYTHON_BIN_RELDIR="$base_dir/$(cat $base_dir/python_bin_reldir.txt | xargs echo)"
PATH="$PYTHON_BIN_RELDIR":"$PYTHON_BIN_RELDIR/Scripts":"$PATH"
fi
exec "$base_dir/.cipd_bin/vpython" "$@"