diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index fdfebc6..9136e12 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,8 @@ New in v1.2.1 (????/??/??) --------------------------- +Properly catch KeyboardInterrupt on Python 2.5. (Andrew Ferguson) + Don't crash if a CacheIndexable tries to clear a non-existent cache entry, since the entry must already be cleared. (Andrew Ferguson) 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) |