mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

display msgpack version as part of sysinfo (e.g. in tracebacks) 

1.1-maint backport
This commit is contained in:
Thomas Waldmann 2019-03-22 14:24:35 +01:00
parent 88b4a00d1b
commit 867bf7d34f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/borg/helpers.py
View File

@ -1627,12 +1627,17 @@ def sysinfo():
linux_distribution = ('Unknown Linux', '', '') linux_distribution = ('Unknown Linux', '', '')
else: else:
linux_distribution = None linux_distribution = None
try:
msgpack_version = '.'.join(str(v) for v in msgpack.version)
except:
msgpack_version = 'unknown'
info = [] info = []
if uname is not None: if uname is not None:
info.append('Platform: %s' % (' '.join(uname), )) info.append('Platform: %s' % (' '.join(uname), ))
if linux_distribution is not None: if linux_distribution is not None:
info.append('Linux: %s %s %s' % linux_distribution) info.append('Linux: %s %s %s' % linux_distribution)
info.append('Borg: %s Python: %s %s' % (borg_version, python_implementation, python_version)) info.append('Borg: %s Python: %s %s msgpack: %s' % (
borg_version, python_implementation, python_version, msgpack_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'))