From 867bf7d34f6dbfd1760d0c2197dbb88a6ba0dbe9 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 22 Mar 2019 14:24:35 +0100 Subject: [PATCH] display msgpack version as part of sysinfo (e.g. in tracebacks) 1.1-maint backport --- src/borg/helpers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/borg/helpers.py b/src/borg/helpers.py index f7a02e2d9..d1ae42896 100644 --- a/src/borg/helpers.py +++ b/src/borg/helpers.py @@ -1627,12 +1627,17 @@ def sysinfo(): linux_distribution = ('Unknown Linux', '', '') else: linux_distribution = None + try: + msgpack_version = '.'.join(str(v) for v in msgpack.version) + except: + msgpack_version = 'unknown' info = [] if uname is not None: info.append('Platform: %s' % (' '.join(uname), )) if linux_distribution is not None: 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('sys.argv: %r' % sys.argv) info.append('SSH_ORIGINAL_COMMAND: %r' % os.environ.get('SSH_ORIGINAL_COMMAND'))