Commit 811ea056 authored by Brian Ryner's avatar Brian Ryner Committed by LUCI CQ

vpython(3) no longer needs to bootstrap python.

The bundled python interpreter is used instead.

Bug: 1318617
Change-Id: I86c359ad765ecf494a11d199f2e01a711c86d4c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3807202Reviewed-by: 's avatarGavin Mak <gavinmak@google.com>
Commit-Queue: Brian Ryner <bryner@google.com>
parent 466ab5c2
......@@ -43,16 +43,8 @@ cipd_bin_setup &> /dev/null
echo $@ from $(pwd) >> "$base_dir/python2_usage.txt"
# If Python bootstrapping is not disabled, make sure Python has been
# bootstrapped and add it to the front of PATH.
if [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
cmd.exe //c $0.bat "$@"
elif [[ $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
if [[ ! -e "$base_dir/python_bin_reldir.txt" ]]; then
source "$base_dir/bootstrap_python3"
bootstrap_python3
fi
exec "$base_dir/.cipd_bin/vpython" "$@"
else
exec "$base_dir/.cipd_bin/vpython" "$@"
fi
......@@ -39,16 +39,8 @@ 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 [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
cmd.exe //c $0.bat "$@"
elif [[ $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
if [[ ! -e "$base_dir/python3_bin_reldir.txt" ]]; then
source "$base_dir/bootstrap_python3"
bootstrap_python3
fi
exec "$base_dir/.cipd_bin/vpython3" "$@"
else
exec "$base_dir/.cipd_bin/vpython3" "$@"
fi
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