From f7b9e70a2e1af7f03a31b7981bdfb2500bb94bb6 Mon Sep 17 00:00:00 2001 From: Yngve Pettersen Date: Wed, 26 Apr 2023 20:07:56 +0000 Subject: [PATCH] Use relative path for cipd Using $base_dir/cipd as a path for the cipd command only works when $base_dir is an absolute path, not when it is a relative path, as the current directory is already $base_dir. Therefore, "./cipd" must be used to run a command located in $base_dir. Change-Id: Ia882a7fb404b7ff837944f80c0ace3f4e90e6a97 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4479169 Reviewed-by: Josip Sokcevic Commit-Queue: Yngve Pettersen --- bootstrap_python3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap_python3 b/bootstrap_python3 index f68919728..9fa1f5f40 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. - "$base_dir/cipd" ensure -log-level warning -ensure-file "${CIPD_MANIFEST}" \ + "./cipd" ensure -log-level warning -ensure-file "${CIPD_MANIFEST}" \ -root "$BOOTSTRAP_PATH" BOOTSTRAP_PYTHON_BIN="${BOOTSTRAP_PATH}/python3/bin/python3"