From adb35ab07f86aeac02f4e37bad41f5fa27f07842 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 21 Nov 2015 22:51:59 +0100 Subject: [PATCH] include system info below traceback, fixes #324 --- borg/archiver.py | 10 +++++----- borg/helpers.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index b65a76300..e45ace68e 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -20,7 +20,7 @@ from .helpers import Error, location_validator, format_time, format_file_size, \ format_file_mode, ExcludePattern, IncludePattern, exclude_path, adjust_patterns, to_localtime, timestamp, \ get_cache_dir, get_keys_dir, prune_within, prune_split, unhexlify, \ Manifest, remove_surrogates, update_excludes, format_archive, check_extension_modules, Statistics, \ - dir_is_tagged, bigint_to_int, ChunkerParams, CompressionSpec, is_slow_msgpack, yes, \ + dir_is_tagged, bigint_to_int, ChunkerParams, CompressionSpec, is_slow_msgpack, yes, sysinfo, \ EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR from .logger import create_logger, setup_logging logger = create_logger() @@ -1224,16 +1224,16 @@ def main(): # pragma: no cover except Error as e: msg = e.get_message() if e.traceback: - msg += "\n%s" % traceback.format_exc() + msg += "\n%s\n%s" % (traceback.format_exc(), sysinfo()) exit_code = e.exit_code except RemoteRepository.RPCError as e: - msg = 'Remote Exception.\n%s' % str(e) + msg = 'Remote Exception.\n%s\n%s' % (str(e), sysinfo()) exit_code = EXIT_ERROR except Exception: - msg = 'Local Exception.\n%s' % traceback.format_exc() + msg = 'Local Exception.\n%s\n%s' % (traceback.format_exc(), sysinfo()) exit_code = EXIT_ERROR except KeyboardInterrupt: - msg = 'Keyboard interrupt.\n%s' % traceback.format_exc() + msg = 'Keyboard interrupt.\n%s\n%s' % (traceback.format_exc(), sysinfo()) exit_code = EXIT_ERROR if msg: logger.error(msg) diff --git a/borg/helpers.py b/borg/helpers.py index b4fbb7e56..343bcc076 100644 --- a/borg/helpers.py +++ b/borg/helpers.py @@ -14,6 +14,7 @@ except ImportError: TerminalSize = namedtuple('TerminalSize', ['columns', 'lines']) return TerminalSize(int(os.environ.get('COLUMNS', fallback[0])), int(os.environ.get('LINES', fallback[1]))) import sys +import platform import time import unicodedata @@ -887,3 +888,13 @@ def yes(msg=None, retry_msg=None, false_msg=None, true_msg=None, if retry_msg: print(retry_msg, file=ofile, end='') ofile.flush() + + +def sysinfo(): + info = [] + info.append('Platform: %s' % (' '.join(platform.uname()), )) + if sys.platform.startswith('linux'): + info.append('Linux: %s %s %s LibC: %s %s' % (platform.linux_distribution() + platform.libc_ver())) + info.append('Python: %s %s' % (platform.python_implementation(), platform.python_version())) + info.append('') + return '\n'.join(info)