From b3c458f96706b7a6ef570434c9c9adc7129912a4 Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 30 May 2002 23:33:17 +0000 Subject: Bug fixes to resuming and error correction code git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@112 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/rorpiter.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'rdiff-backup/rdiff_backup/rorpiter.py') diff --git a/rdiff-backup/rdiff_backup/rorpiter.py b/rdiff-backup/rdiff_backup/rorpiter.py index 1ff0724..6b4a4c0 100644 --- a/rdiff-backup/rdiff_backup/rorpiter.py +++ b/rdiff-backup/rdiff_backup/rorpiter.py @@ -57,6 +57,10 @@ class RORPIter: def Signatures(rp_iter): """Yield signatures of rpaths in given rp_iter""" + def error_handler(exc, rp): + Log("Error generating signature for %s" % rp.path) + return None + for rp in rp_iter: if rp.isplaceholder(): yield rp else: @@ -65,11 +69,9 @@ class RORPIter: if rp.isflaglinked(): rorp.flaglinked() else: fp = Robust.check_common_error( - lambda: Rdiff.get_signature(rp)) + error_handler, Rdiff.get_signature, rp) if fp: rorp.setfile(fp) - else: - Log("Error generating signature for %s" % rp.path) - continue + else: continue yield rorp def GetSignatureIter(base_rp): -- cgit v1.2.1