diff options
| author | Filipe Laíns 🇵🇸 <lains@riseup.net> | 2025-01-08 20:23:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-08 20:23:16 (GMT) |
| commit | 34e840f9ddd9c04991cf004e2594c6a1e0e278d3 (patch) | |
| tree | 06061a1c61d66883b701b0cd66985479740b2703 | |
| parent | 004f9fd1f22643100aa8163cc9f7bcde7df54973 (diff) | |
| download | cpython-34e840f9ddd9c04991cf004e2594c6a1e0e278d3.zip cpython-34e840f9ddd9c04991cf004e2594c6a1e0e278d3.tar.gz cpython-34e840f9ddd9c04991cf004e2594c6a1e0e278d3.tar.bz2 | |
GH-66409: check if exec_prefix is the same as prefix before searching executable_dir (#127974)
| -rw-r--r-- | Misc/NEWS.d/next/Core_and_Builtins/2024-12-15-21-11-26.gh-issue-66409.wv109z.rst | 3 | ||||
| -rw-r--r-- | Modules/getpath.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-12-15-21-11-26.gh-issue-66409.wv109z.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-15-21-11-26.gh-issue-66409.wv109z.rst new file mode 100644 index 0000000..0d70ad0 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-15-21-11-26.gh-issue-66409.wv109z.rst @@ -0,0 +1,3 @@ +During the :ref:`path initialization <sys-path-init>`, we now check if +``base_exec_prefix`` is the same as ``base_prefix`` before falling back to +searching the Python interpreter directory. diff --git a/Modules/getpath.py b/Modules/getpath.py index c34101e..be22103 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -625,6 +625,8 @@ else: # gh-100320: Our PYDs are assumed to be relative to the Lib directory # (that is, prefix) rather than the executable (that is, executable_dir) exec_prefix = prefix + if not exec_prefix and prefix and isdir(joinpath(prefix, PLATSTDLIB_LANDMARK)): + exec_prefix = prefix if not exec_prefix and executable_dir: exec_prefix = search_up(executable_dir, PLATSTDLIB_LANDMARK, test=isdir) if not exec_prefix and EXEC_PREFIX: |