diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2004-01-31 23:36:57 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2004-01-31 23:36:57 +0000 |
| commit | 4d7e746f870a27cca9f37429f26e0411b8f4fcde (patch) | |
| tree | f7ff4aa7ff86c6223aab2426a31b98b07ef83687 | |
| parent | 1559cf861919eaf534989dd612165c999aeb016a (diff) | |
| download | rdiff-backup-4d7e746f870a27cca9f37429f26e0411b8f4fcde.tar.gz | |
Backported regress fix when rf.metadata_rorp missing
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@518 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/regress.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index c0664c9..df83047 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -9,6 +9,8 @@ Kaltenecker for bug report. Fixed error when --restrict path given with trailing backslash. Bug 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) --------------------------- diff --git a/rdiff-backup/rdiff_backup/regress.py b/rdiff-backup/rdiff_backup/regress.py index ddab217..e3ff555 100644 --- a/rdiff-backup/rdiff_backup/regress.py +++ b/rdiff-backup/rdiff_backup/regress.py @@ -159,15 +159,13 @@ 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 raw_rf: - raw_rf.set_metadata_rorp(metadata_rorp) - yield raw_rf - else: + if not raw_rf: log.Log("Warning, metadata file has entry for %s,\n" "but there are no associated files." % (metadata_rorp.get_indexpath(),), 2) - yield RegressFile(mirror_rp.new_index(metadata_rorp.index), - inc_rp.new_index(metadata_rorp.index), ()) + continue + raw_rf.set_metadata_rorp(metadata_rorp) + yield raw_rf class RegressFile(restore.RestoreFile): |