summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/regress.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-07-25 05:58:43 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-07-25 05:58:43 +0000
commit25fd648ab89d794f48f5c1ce8800aeabcb118d21 (patch)
treeef8755eab93df3c9bc2b046b8198cfebe4a4410d /rdiff-backup/rdiff_backup/regress.py
parent39d57e6d23df6e43650791ee6667cec36a9a5f1d (diff)
downloadrdiff-backup-25fd648ab89d794f48f5c1ce8800aeabcb118d21.tar.gz
Final changes for 0.12.2
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@368 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/regress.py')
-rw-r--r--rdiff-backup/rdiff_backup/regress.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/regress.py b/rdiff-backup/rdiff_backup/regress.py
index 4246431..883c609 100644
--- a/rdiff-backup/rdiff_backup/regress.py
+++ b/rdiff-backup/rdiff_backup/regress.py
@@ -140,13 +140,15 @@ def iterate_meta_rfs(mirror_rp, inc_rp):
raw_rfs = iterate_raw_rfs(mirror_rp, inc_rp)
collated = rorpiter.Collate2Iters(raw_rfs, yield_metadata())
for raw_rf, metadata_rorp in collated:
- if not raw_rf:
+ if raw_rf:
+ raw_rf.set_metadata_rorp(metadata_rorp)
+ yield raw_rf
+ else:
log.Log("Warning, metadata file has entry for %s,\n"
"but there are no associated files." %
(metadata_rorp.get_indexpath(),), 2)
- continue
- raw_rf.set_metadata_rorp(metadata_rorp)
- yield raw_rf
+ yield RegressFile(mirror_rp.new_index(metadata_rorp.index),
+ inc_rp.new_index(metadata_rorp.index), ())
class RegressFile(restore.RestoreFile):