[Rdiff-backup-commits] rdiff-backup/rdiff_backup metadata.py

[Ben Escoto]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         
Changes by:     Ben Escoto <address@hidden>     06/01/29 22:16:05

Modified files:
        rdiff_backup   : metadata.py 

Log message:
        Catch ValueError if parsing corrupt mirror_metadata file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/metadata.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: rdiff-backup/rdiff_backup/metadata.py
diff -u rdiff-backup/rdiff_backup/metadata.py:1.24 
rdiff-backup/rdiff_backup/metadata.py:1.25
--- rdiff-backup/rdiff_backup/metadata.py:1.24  Fri Dec 16 20:25:58 2005
+++ rdiff-backup/rdiff_backup/metadata.py       Sun Jan 29 22:16:05 2006
@@ -269,7 +269,7 @@
                """Return iterator that yields all objects with records"""
                for record in self.iterate_records():
                        try: yield self.record_to_object(record)
-                       except ParsingError, e:
+                       except (ParsingError, ValueError), e:
                                if self.at_end: break # Ignore whitespace/bad 
records at end
                                log.Log("Error parsing flat file: %s" % (e,), 2)
 
@@ -314,7 +314,7 @@
                while 1:
                        next_pos = self.get_next_pos()
                        try: obj = self.record_to_object(self.buf[:next_pos])
-                       except ParsingError, e:
+                       except (ParsingError, ValueError), e:
                                log.Log("Error parsing metadata file: %s" % 
(e,), 2)
                        else:
                                if obj.index[:len(index)] != index: break