Commit 9dfc0f49 authored by owsla's avatar owsla

Properly catch KeyboardInterrupt on Python 2.5


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@923 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent a399c923
New in v1.2.1 (????/??/??) 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, Don't crash if a CacheIndexable tries to clear a non-existent cache entry,
since the entry must already be cleared. (Andrew Ferguson) since the entry must already be cleared. (Andrew Ferguson)
......
...@@ -301,7 +301,7 @@ def error_check_Main(arglist): ...@@ -301,7 +301,7 @@ def error_check_Main(arglist):
"""Run Main on arglist, suppressing stack trace for routine errors""" """Run Main on arglist, suppressing stack trace for routine errors"""
try: Main(arglist) try: Main(arglist)
except SystemExit: raise except SystemExit: raise
except Exception, exc: except (Exception, KeyboardInterrupt), exc:
errmsg = robust.is_routine_fatal(exc) errmsg = robust.is_routine_fatal(exc)
if errmsg: if errmsg:
Log.exception(2, 6) Log.exception(2, 6)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment