commit f90cc29837566e205aff31cc2ceb0c620b6e1f23
author Mike Frysinger <vapier@chromium.org> Fri Aug 11 15:43:04 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 11 15:43:04 2023 +0000
tree a364e1fdad8d42de5d3cc699229087ec101f4a8f
parent 69611efc0314e8e8b219c5e04cf56c7373e04205

vpython: clear DEPOT_TOOLS_DIR before running scripts

Once we're done using DEPOT_TOOLS_DIR to bootstrap ourselves, remove
it from the env so it isn't passed to the python script which might
in turn run commands from other depot_tools trees.  Like gclient and
running chromium/src/third_party/depot_tools/ programs.

Bug: 1470590
Change-Id: I3dee847e45896ee25f01054026805277fc373c37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4764126
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

vpython

diff --git a/vpython b/vpython
index 42d112f..55fd4aa 100755
--- a/vpython
+++ b/vpython
@@ -42,11 +42,15 @@
 source "${DEPOT_TOOLS_DIR}/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
+# Don't pass this to the Python script as it might turn around and run commands
+# in other depot_tools dirs.
+base_dir="${DEPOT_TOOLS_DIR}"
+unset DEPOT_TOOLS_DIR
 case "${DEPOT_TOOLS_UNAME_S}" in
 mingw*|cygwin*)
   cmd.exe //c $0.bat "$@"
   ;;
 *)
-  exec "${DEPOT_TOOLS_DIR}/.cipd_bin/vpython" "$@"
+  exec "${base_dir}/.cipd_bin/vpython" "$@"
   ;;
 esac