[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/connection...
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/connection.... |
Date: |
Wed, 24 Sep 2008 00:25:47 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Changes by: Andrew Ferguson <owsla> 08/09/24 00:25:47
Modified files:
. : CHANGELOG
rdiff_backup : connection.py robust.py
Log message:
Improve support for Python 2.5, which refactored the built-in
exceptions so
that SystemExit and KeyboardInterrupt no longer derive from Exception.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.301&r2=1.302
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/connection.py?cvsroot=rdiff-backup&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/robust.py?cvsroot=rdiff-backup&r1=1.40&r2=1.41
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -b -r1.301 -r1.302
--- CHANGELOG 4 Sep 2008 23:36:19 -0000 1.301
+++ CHANGELOG 24 Sep 2008 00:25:45 -0000 1.302
@@ -1,6 +1,10 @@
New in v1.2.2 (????/??/??)
---------------------------
+Improve support for Python 2.5, which refactored the built-in exceptions so
+that SystemExit and KeyboardInterrupt no longer derive from Exception.
+Closes support request #106504. (Andrew Ferguson)
+
Adjust --exclude-if-present option to support directories, symlinks, device
files, etc. Closes bug #24192. Thanks to Vadim Zeitlin for the suggestion.
Index: rdiff_backup/connection.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/connection.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- rdiff_backup/connection.py 2 Jul 2008 18:03:23 -0000 1.30
+++ rdiff_backup/connection.py 24 Sep 2008 00:25:47 -0000 1.31
@@ -368,6 +368,8 @@
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):
Index: rdiff_backup/robust.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/robust.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- rdiff_backup/robust.py 4 Jul 2008 02:10:49 -0000 1.40
+++ rdiff_backup/robust.py 24 Sep 2008 00:25:47 -0000 1.41
@@ -30,7 +30,7 @@
"""
try: return function(*args)
- except Exception, exc:
+ except (Exception, KeyboardInterrupt, SystemExit), exc:
TracebackArchive.add([function] + list(args))
if catch_error(exc):
log.Log.exception()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/connection....,
Andrew Ferguson <=