summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/connection.py
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-09-24 00:25:47 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-09-24 00:25:47 +0000
commit7edbfd9ff7f0a8f667e5c4bfd590911d286b7d46 (patch)
tree8f45cd5ea9154f3de57cf636a19044babd215bec /rdiff-backup/rdiff_backup/connection.py
parente91387a44c73c9a8bfdbb8f150e51f29c0951f66 (diff)
downloadrdiff-backup-7edbfd9ff7f0a8f667e5c4bfd590911d286b7d46.tar.gz
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
Diffstat (limited to 'rdiff-backup/rdiff_backup/connection.py')
-rw-r--r--rdiff-backup/rdiff_backup/connection.py2
1 files changed, 2 insertions, 0 deletions
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):