mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-46028: Calculate base_executable by resolving symlinks in a venv (GH-30144)

Browse source
This commit is contained in:
Steve Dower 2022-01-18 15:46:26 +00:00 • committed by GitHub
parent 32398294fb
commit 7407fe4c25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/getpath.py
View file

@ -351,7 +351,18 @@ if not home and not py_setpath:
key, had_equ, value = line.partition('=')
if had_equ and key.strip().lower() == 'home':
executable_dir = real_executable_dir = value.strip()
base_executable = joinpath(executable_dir, basename(executable))
if not base_executable:
# First try to resolve symlinked executables, since that may be
# more accurate than assuming the executable in 'home'.
try:
base_executable = realpath(executable)
if base_executable == executable:
# No change, so probably not a link. Clear it and fall back
base_executable = ''
except OSError:
pass
if not base_executable:
base_executable = joinpath(executable_dir, basename(executable))
break
else:
venv_prefix = None