Repository navigation
[3.15] gh-106045: Keep searching from venv home when the resolved base executable has no stdlib (GH-160123) - #160354
Merged
Conversation
… executable has no stdlib (pythonGH-160123) pythonGH-156483 made `getpath` locate a venv's base installation relative to the *resolved* base executable instead of the `home` key in `pyvenv.cfg`. When the resolved executable lives outside the installation tree (e.g. a launcher binary symlinked into it), nothing is found there and discovery falls back to the compiled-in `PREFIX`. The venv then either fails to start or silently runs with another installation's standard library. This PR: - Keeps pythonGH-156483's behavior when the resolved executable's directory locates a standard library (`pybuilddir.txt`, the stdlib zip, or `os.py`). Otherwise it keeps searching from `home`, as before pythonGH-156483. - In that fallback case, still searches the resolved executable's directory for `lib-dynload` when determining `exec_prefix`: after `prefix`, before `home` and the compiled-in `EXEC_PREFIX`. Layouts with a separate exec prefix (e.g. `./configure --exec-prefix`) then keep loading extension modules from the right place, and a stale `lib-dynload` near the `home` symlink can't take precedence over the one beside the resolved executable. The tests added by pythonGH-156483 pass unchanged. Three new `test_getpath` cases cover the launcher-outside-the-installation and separate-exec-prefix layouts, and a misleading `lib-dynload` near `home`; each fails without this change. <details> <summary>Reproducer</summary> On `main` (0a86a34), with a plain `./configure --prefix=$HOME/py-under-test && make && make install`: ```sh #!/bin/sh # Usage: venv-home-repro.sh <installed-prefix> <X.Y> set -eu PREFIX=$1; VER=$2 W=$(mktemp -d) mkdir -p "$W/runtime/bin" "$W/runtime/lib" "$W/launcher" cp -R "$PREFIX/lib/python$VER" "$W/runtime/lib/" cp "$PREFIX/bin/python$VER" "$W/launcher/python3" ln -s "$W/launcher/python3" "$W/runtime/bin/python3" PYTHONHOME="$W/runtime" "$W/runtime/bin/python3" -m venv --without-pip "$W/venv" grep '^home' "$W/venv/pyvenv.cfg" echo "expected base_prefix: $W/runtime" "$W/venv/bin/python" -c 'import os, sys; print("actual base_prefix:", sys.base_prefix); print("os.py loaded from:", os.__file__)' ``` Before: ``` home = /tmp/tmp.NFug9wEr4h/runtime/bin expected base_prefix: /tmp/tmp.NFug9wEr4h/runtime actual base_prefix: /home/user/py-under-test os.py loaded from: /home/user/py-under-test/lib/python3.16/os.py ``` (With `$HOME/py-under-test/lib/python3.16` removed, the venv instead fails with `ModuleNotFoundError: No module named 'encodings'`.) After: ``` home = /tmp/tmp.8Zne2otFrw/runtime/bin expected base_prefix: /tmp/tmp.8Zne2otFrw/runtime actual base_prefix: /tmp/tmp.8Zne2otFrw/runtime os.py loaded from: /tmp/tmp.8Zne2otFrw/runtime/lib/python3.16/os.py ``` </details> (cherry picked from commit 5b55b50) Co-authored-by: Itamar Oren <itamarost@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GH-156483 made
getpathlocate a venv's base installation relative to the resolved base executable instead of thehomekey inpyvenv.cfg. When the resolved executable lives outside the installation tree (e.g. a launcher binary symlinked into it), nothing is found there and discovery falls back to the compiled-inPREFIX. The venv then either fails to start or silently runs with another installation's standard library.This PR:
pybuilddir.txt, the stdlib zip, oros.py). Otherwise it keeps searching fromhome, as before gh-106045: Fix venv path discovery for symlinked executables #156483.lib-dynloadwhen determiningexec_prefix: afterprefix, beforehomeand the compiled-inEXEC_PREFIX. Layouts with a separate exec prefix (e.g../configure --exec-prefix) then keep loading extension modules from the right place, and a stalelib-dynloadnear thehomesymlink can't take precedence over the one beside the resolved executable.The tests added by GH-156483 pass unchanged. Three new
test_getpathcases cover the launcher-outside-the-installation and separate-exec-prefix layouts, and a misleadinglib-dynloadnearhome; each fails without this change.Reproducer
On
main(0a86a34), with a plain./configure --prefix=$HOME/py-under-test && make && make install:Before:
(With
$HOME/py-under-test/lib/python3.16removed, the venv instead fails withModuleNotFoundError: No module named 'encodings'.)After:
Co-authored-by: Itamar Oren itamarost@gmail.com