From 7edbfd9ff7f0a8f667e5c4bfd590911d286b7d46 Mon Sep 17 00:00:00 2001 From: owsla Date: Wed, 24 Sep 2008 00:25:47 +0000 Subject: Improve support for Python 2.5, which refactored the built-in exceptions so that SystemExit and KeyboardInterrupt no longer derive from Exception. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@936 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/connection.py | 2 ++ rdiff-backup/rdiff_backup/robust.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'rdiff-backup/rdiff_backup') diff --git a/rdiff-backup/rdiff_backup/connection.py b/rdiff-backup/rdiff_backup/connection.py index 34aebae..2fbe8ea 100644 --- a/rdiff-backup/rdiff_backup/connection.py +++ b/rdiff-backup/rdiff_backup/connection.py @@ -368,6 +368,8 @@ class PipeConnection(LowLevelPipeConnection): result = self.get_response(req_num) self.unused_request_numbers[req_num] = None if isinstance(result, Exception): raise result + elif isinstance(result, SystemExit): raise result + elif isinstance(result, KeyboardInterrupt): raise result else: return result def get_new_req_num(self): diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index d339c24..1036801 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -30,7 +30,7 @@ def check_common_error(error_handler, function, args = []): """ try: return function(*args) - except Exception, exc: + except (Exception, KeyboardInterrupt, SystemExit), exc: TracebackArchive.add([function] + list(args)) if catch_error(exc): log.Log.exception() -- cgit v1.2.1