diff options
Diffstat (limited to 'rdiff-backup')
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/longname.py | 8 | ||||
| -rw-r--r-- | rdiff-backup/testing/metadatatest.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 1de8500..049ed3b 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,4 +1,4 @@ -New in v1.1.3 (????/??/??) +New in v1.1.3 (2005/11/25) -------------------------- Regression metadata bug introduced with 1.1.1/1.1.2 fixed. diff --git a/rdiff-backup/rdiff_backup/longname.py b/rdiff-backup/rdiff_backup/longname.py index 9d3697a..0cfcaf3 100644 --- a/rdiff-backup/rdiff_backup/longname.py +++ b/rdiff-backup/rdiff_backup/longname.py @@ -250,11 +250,11 @@ def update_rf(rf, rorp, mirror_root): """Make a new rf when long name info is available""" if rorp.has_alt_mirror_name(): inc_name = rorp.get_alt_mirror_name() - mirror_rp = get_long_rp(mirror_name) - elif rorp.has_alt_inc_name(): - inc_name = rorp.get_alt_inc_name() + mirror_rp = get_long_rp(inc_name) + else: mirror_rp = mirror_root.new_index(rorp.index) - else: assert 0, "Making new rf when rorp has no alternate name info" + if rorp.has_alt_inc_name(): inc_name = rorp.get_alt_inc_name() + else: return restore.RestoreFile(mirror_rp, None, []) rf = restore.RestoreFile(mirror_rp, None, []) update_incs(rf, inc_name) diff --git a/rdiff-backup/testing/metadatatest.py b/rdiff-backup/testing/metadatatest.py index f17ec3e..e3199d7 100644 --- a/rdiff-backup/testing/metadatatest.py +++ b/rdiff-backup/testing/metadatatest.py @@ -1,6 +1,6 @@ import unittest, os, cStringIO, time -from rdiff_backup.metadata import * from rdiff_backup import rpath, connection, Globals, selection, lazy +from rdiff_backup.metadata import * tempdir = rpath.RPath(Globals.local_connection, "testfiles/output") |