Browse Source

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

1.1-maint backport
Thomas Waldmann 6 years ago
parent
commit
867bf7d34f
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/borg/helpers.py

+ 6 - 1
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'))