summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/longname.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-26 04:56:15 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-26 04:56:15 +0000
commit4113f772fff9cf0a33c757b0e1b5dfae68716430 (patch)
treee3154edcb783ba2a96f25cfbf3eb4d1847581dbe /rdiff-backup/rdiff_backup/longname.py
parentf419fb9ed0a1bbbc81a6de5b5bb1a6a14f4d51e3 (diff)
downloadrdiff-backup-4113f772fff9cf0a33c757b0e1b5dfae68716430.tar.gz
Final changes for 1.1.3
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@697 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/longname.py')
-rw-r--r--rdiff-backup/rdiff_backup/longname.py8
1 files changed, 4 insertions, 4 deletions
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)