From a1b3db589ff2c2da6037fec82717f4d27477f50f Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 29 Mar 2023 22:20:34 +0000 Subject: [PATCH] bootstrap_python3: Find 'cipd' in base_dir, not PATH There might be multiple copies of depot_tools involved, and it might not even be on PATH. This matches the pattern of various other setup/bootstrap scripts (e.g., cipd_bin_setup.sh). BUG=none TEST=`.../ensure_bootstrap` without being on PATH Change-Id: Ic9135298629726e69619d259af110684d017d0f6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4377789 Commit-Queue: Brian Norris Reviewed-by: Dirk Pranke --- bootstrap_python3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap_python3 b/bootstrap_python3 index 96110dee5..f68919728 100644 --- a/bootstrap_python3 +++ b/bootstrap_python3 @@ -25,7 +25,7 @@ function bootstrap_python3 { BOOTSTRAP_PATH="bootstrap-${PYTHON3_VERSION}_bin" # Install CIPD packages. The CIPD client self-bootstraps. - "cipd" ensure -log-level warning -ensure-file "${CIPD_MANIFEST}" \ + "$base_dir/cipd" ensure -log-level warning -ensure-file "${CIPD_MANIFEST}" \ -root "$BOOTSTRAP_PATH" BOOTSTRAP_PYTHON_BIN="${BOOTSTRAP_PATH}/python3/bin/python3"