[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/08/16 16:42:50

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Main.py 

Log message:
        Properly catch KeyboardInterrupt on Python 2.5

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.296&r2=1.297
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.116&r2=1.117

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -b -r1.296 -r1.297
--- CHANGELOG   30 Jul 2008 00:58:34 -0000      1.296
+++ CHANGELOG   16 Aug 2008 16:42:50 -0000      1.297
@@ -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)
 

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- rdiff_backup/Main.py        3 Jan 2008 15:05:55 -0000       1.116
+++ rdiff_backup/Main.py        16 Aug 2008 16:42:50 -0000      1.117
@@ -301,7 +301,7 @@
        """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)