upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-28 01:28:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5904 from ThomasWaldmann/fix-pyinstaller-dir-mode-1.1

Browse source 
fix pyinstaller detection for dir-mode, fixes #5897
This commit is contained in:
TW 2021-07-10 23:56:47 +02:00 committed by GitHub
commit 7cfb03a67c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/borg/helpers.py
View file

@ -2445,10 +2445,9 @@ def prepare_subprocess_env(system, env=None):
# in the original env (in this case, the pyinstaller bootloader
# does *not* put ..._ORIG into the env either).
# in this case, we must kill LDLP.
# The directory used by pyinstaller is created by mkdtemp("_MEIXXXXXX"),
# we can use that to differentiate between the cases.
# We can recognize this via sys.frozen and sys._MEIPASS being set.
lp = env.get(lp_key)
if lp is not None and re.search(r'/_MEI......', lp):
if lp is not None and getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
env.pop(lp_key)
# security: do not give secrets to subprocess
env.pop('BORG_PASSPHRASE', None)