Commit 0ab6a9f6 authored by Edward Lemur's avatar Edward Lemur Committed by Commit Bot

depot_tools: Use system's python for vpython.

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/+/1930181Reviewed-by: 's avatarAnthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
parent 80012971
...@@ -39,15 +39,4 @@ base_dir=$(dirname "$0") ...@@ -39,15 +39,4 @@ base_dir=$(dirname "$0")
source "$base_dir/cipd_bin_setup.sh" source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null 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" "$@" exec "$base_dir/.cipd_bin/vpython" "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment