Commit 78dc8c60 authored by bescoto's avatar bescoto

Backported regress fix when rf.metadata_rorp missing


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@518 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent b05747e4
...@@ -9,6 +9,8 @@ Kaltenecker for bug report. ...@@ -9,6 +9,8 @@ Kaltenecker for bug report.
Fixed error when --restrict path given with trailing backslash. Bug Fixed error when --restrict path given with trailing backslash. Bug
report by Åke Brännström. report by Åke Brännström.
Backported regress fix from 0.13.x. But noticed by Alan Horn.
New in v0.12.6 (2003/11/02) New in v0.12.6 (2003/11/02)
--------------------------- ---------------------------
......
...@@ -159,15 +159,13 @@ def iterate_meta_rfs(mirror_rp, inc_rp): ...@@ -159,15 +159,13 @@ def iterate_meta_rfs(mirror_rp, inc_rp):
raw_rfs = iterate_raw_rfs(mirror_rp, inc_rp) raw_rfs = iterate_raw_rfs(mirror_rp, inc_rp)
collated = rorpiter.Collate2Iters(raw_rfs, yield_metadata()) collated = rorpiter.Collate2Iters(raw_rfs, yield_metadata())
for raw_rf, metadata_rorp in collated: for raw_rf, metadata_rorp in collated:
if raw_rf: if not raw_rf:
raw_rf.set_metadata_rorp(metadata_rorp)
yield raw_rf
else:
log.Log("Warning, metadata file has entry for %s,\n" log.Log("Warning, metadata file has entry for %s,\n"
"but there are no associated files." % "but there are no associated files." %
(metadata_rorp.get_indexpath(),), 2) (metadata_rorp.get_indexpath(),), 2)
yield RegressFile(mirror_rp.new_index(metadata_rorp.index), continue
inc_rp.new_index(metadata_rorp.index), ()) raw_rf.set_metadata_rorp(metadata_rorp)
yield raw_rf
class RegressFile(restore.RestoreFile): class RegressFile(restore.RestoreFile):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment