[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/robust.py [r1-2]

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         r1-2
Changes by:     Andrew Ferguson <owsla> 09/03/08 19:51:21

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : robust.py 

Log message:
        Don't crash on zlib errors

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.14&r2=1.338.2.15
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/robust.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.44.2.1&r2=1.44.2.2

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.14
retrieving revision 1.338.2.15
diff -u -b -r1.338.2.14 -r1.338.2.15
--- CHANGELOG   8 Mar 2009 17:25:00 -0000       1.338.2.14
+++ CHANGELOG   8 Mar 2009 19:51:20 -0000       1.338.2.15
@@ -1,6 +1,8 @@
 New in v1.2.8 (????/??/??)
 ---------------------------
 
+Don't crash on zlib errors. Closes Debian bug #518531. (Andrew Ferguson)
+
 Make sticky bit warnings quieter while determining file system abilities.
 Closes Savannah bug #25788. (Andrew Ferguson)
 

Index: rdiff_backup/robust.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/robust.py,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -b -r1.44.2.1 -r1.44.2.2
--- rdiff_backup/robust.py      6 Jan 2009 21:10:45 -0000       1.44.2.1
+++ rdiff_backup/robust.py      8 Mar 2009 19:51:20 -0000       1.44.2.2
@@ -19,7 +19,7 @@
 
 """Catch various exceptions given system call"""
 
-import errno, signal, exceptions
+import errno, signal, exceptions, zlib
 import librsync, C, static, rpath, Globals, log, statistics, connection
 
 def check_common_error(error_handler, function, args = []):
@@ -45,7 +45,8 @@
 def catch_error(exc):
        """Return true if exception exc should be caught"""
        for exception_class in (rpath.SkipFileException, rpath.RPathException,
-                                                       librsync.librsyncError, 
C.UnknownFileTypeError):
+                                                       librsync.librsyncError, 
C.UnknownFileTypeError,
+                                                       zlib.error):
                if isinstance(exc, exception_class): return 1
        if (isinstance(exc, EnvironmentError) and
                # the invalid mode shows up in backups of /proc for some reason