Skip to content

Commit fdbf2a6

Browse files
committed
fix typo; fix broken test
1 parent f0857da commit fdbf2a6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

python/private/stage1_bootstrap_template.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ if [[ "$IS_ZIPFILE" == "1" ]]; then
132132
mkdir -p "$(dirname $python_exe)"
133133
ln -s "$symlink_to" "$python_exe"
134134
elif [[ "$RECREATE_VENV_AT_RUNTIME" == "1" ]]; then
135-
if [[ -n "$RULES_PYTHON_EXTRACT_ROOTT" ]]; then
135+
if [[ -n "$RULES_PYTHON_EXTRACT_ROOT" ]]; then
136136
use_exec=1
137137
# Use our runfiles path as a unique, reusable, location for the
138138
# binary-specific venv being created.
139-
venv="$RULES_PYTHON_EXTRACT_ROOTT/$(dirname $(dirname $PYTHON_BINARY))"
140-
mkdir -p $RULES_PYTHON_EXTRACT_ROOTT
139+
venv="$RULES_PYTHON_EXTRACT_ROOT/$(dirname $(dirname $PYTHON_BINARY))"
140+
mkdir -p $RULES_PYTHON_EXTRACT_ROOT
141141
else
142142
# Re-exec'ing can't be used because we have to clean up the temporary
143143
# venv directory that is created.

tests/bootstrap_impls/run_binary_venvs_use_declare_symlink_no_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function expect_match() {
4747

4848
expect_match "sys.executable:.*tmp.*python3" "$actual"
4949

50-
venvs_root=$(mkdir -d)
51-
50+
# Now test that using a custom location for the bootstrap files works
51+
venvs_root=$(mktemp -d)
5252
actual=$(RULES_PYTHON_EXTRACT_ROOT=$venvs_root $bin)
5353
expect_match "sys.executable:.*$venvs_root" "$actual"
5454

0 commit comments

Comments
 (0)