mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00
Code Issues Releases Wiki Activity

run platform.* calls within a cleaned env, fixes #3732

Browse source 
also: add exception handler around deprecated platform.linux_distribution() call.
This commit is contained in:
Thomas Waldmann 2018-03-29 16:45:37 +02:00
parent 39bf81276b
commit 1e94211bf5
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/borg/helpers.py
View file

@ -1602,11 +1602,29 @@ def finish(self):
def sysinfo(): def sysinfo():
orig_env = os.environ
cleaned_env = prepare_subprocess_env(system=True)
linux_distribution = None
try:
# some platform calls internally run /bin/sh, so run them within a cleaned env,
# so that sh doesn't use pyinstaller env libs, but system libs, see #3732
os.environ = cleaned_env
uname = platform.uname()
python_implementation = platform.python_implementation()
python_version = platform.python_version()
if sys.platform.startswith('linux'):
try:
linux_distribution = platform.linux_distribution()
except:
# platform.linux_distribution() is deprecated since py 3.5 and removed in 3.7.
linux_distribution = ('Unknown Linux', '', '')
finally:
os.environ = orig_env
info = [] info = []
info.append('Platform: %s' % (' '.join(platform.uname()), )) info.append('Platform: %s' % (' '.join(uname), ))
if sys.platform.startswith('linux'): if linux_distribution is not None:
info.append('Linux: %s %s %s' % platform.linux_distribution()) info.append('Linux: %s %s %s' % linux_distribution)
info.append('Borg: %s Python: %s %s' % (borg_version, platform.python_implementation(), platform.python_version())) info.append('Borg: %s Python: %s %s' % (borg_version, python_implementation, python_version))
info.append('PID: %d CWD: %s' % (os.getpid(), os.getcwd())) info.append('PID: %d CWD: %s' % (os.getpid(), os.getcwd()))
info.append('sys.argv: %r' % sys.argv) info.append('sys.argv: %r' % sys.argv)
info.append('SSH_ORIGINAL_COMMAND: %r' % os.environ.get('SSH_ORIGINAL_COMMAND')) info.append('SSH_ORIGINAL_COMMAND: %r' % os.environ.get('SSH_ORIGINAL_COMMAND'))