summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-29 22:16:05 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-29 22:16:05 +0000
commit360fed4071ef341232c809ede0e6321b5f781e76 (patch)
treeae38e188b23ed0bcf94fbeee161b2f5aee414ad2
parent5c1c2b59941983f6658331a7243268ec229ce52c (diff)
downloadrdiff-backup-360fed4071ef341232c809ede0e6321b5f781e76.tar.gz
Catch ValueError if parsing corrupt mirror_metadata file
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@753 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/rdiff_backup/metadata.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/metadata.py b/rdiff-backup/rdiff_backup/metadata.py
index cb8ef41..a96d2e0 100644
--- a/rdiff-backup/rdiff_backup/metadata.py
+++ b/rdiff-backup/rdiff_backup/metadata.py
@@ -269,7 +269,7 @@ class FlatExtractor:
"""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 @@ class FlatExtractor:
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