summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-08-16 16:42:50 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-08-16 16:42:50 +0000
commit37ffc37a68f5418146e0a1b7c46731555ff85005 (patch)
tree51315a9487ef751a2ce2e78d535227c7c9d0c218 /rdiff-backup/rdiff_backup
parent37b6b46b3e582f72c44e2f778afe94d53582985b (diff)
downloadrdiff-backup-37ffc37a68f5418146e0a1b7c46731555ff85005.tar.gz
Properly catch KeyboardInterrupt on Python 2.5
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@923 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r--rdiff-backup/rdiff_backup/Main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index b976424..6e050c0 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -301,7 +301,7 @@ def error_check_Main(arglist):
"""Run Main on arglist, suppressing stack trace for routine errors"""
try: Main(arglist)
except SystemExit: raise
- except Exception, exc:
+ except (Exception, KeyboardInterrupt), exc:
errmsg = robust.is_routine_fatal(exc)
if errmsg:
Log.exception(2, 6)