forks/archivebox
1
0
Fork 0
Code Releases Activity

bin_version means to modify, not replace environ

Browse source 
the `bin_version` function means to modify the environment,
not replace it entirely. Fixes bugs that occur when it wipes out the
PATH environment variable, such as when running in a virtual
environment.
This commit is contained in:
Ross Williams 2023-03-20 14:25:29 -04:00
parent 3e5e9c7a41
commit 9d9872d325
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archivebox/config.py
View file

@ -690,7 +690,8 @@ def bin_version(binary: Optional[str]) -> Optional[str]:
return None return None
try: try:
version_str = run([abspath, "--version"], stdout=PIPE, env={'LANG': 'C'}).stdout.strip().decode() bin_env = os.environ | {'LANG': 'C'}
version_str = run([abspath, "--version"], stdout=PIPE, env=bin_env).stdout.strip().decode()
if not version_str: if not version_str:
version_str = run([abspath, "--version"], stdout=PIPE).stdout.strip().decode() version_str = run([abspath, "--version"], stdout=PIPE).stdout.strip().decode()
# take first 3 columns of first line of version info # take first 3 columns of first line of version info