summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/rorpiter.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-17 05:55:18 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-17 05:55:18 +0000
commit1b992fb662acb7e68e9a25526c73178446b2d291 (patch)
tree3654313045b5bc014ac4e3c64d5bef994d8ff61d /rdiff-backup/rdiff_backup/rorpiter.py
parent3021c1ff874660b3238e901fef8425ff3eee1d7a (diff)
downloadrdiff-backup-1b992fb662acb7e68e9a25526c73178446b2d291.tar.gz
Further fix so we can restore backups with mirror_metadata files
missing intermediate directory git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@620 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rorpiter.py')
-rw-r--r--rdiff-backup/rdiff_backup/rorpiter.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/rdiff-backup/rdiff_backup/rorpiter.py b/rdiff-backup/rdiff_backup/rorpiter.py
index 9bf75d4..88d5bcd 100644
--- a/rdiff-backup/rdiff_backup/rorpiter.py
+++ b/rdiff-backup/rdiff_backup/rorpiter.py
@@ -184,6 +184,12 @@ def FillInIter(rpiter, rootrp):
for i in range(1, len(cur_index)): # i==0 case already handled
if cur_index[:i] != old_index[:i]:
filler_rp = rootrp.new_index(cur_index[:i])
+ if not filler_rp.isdir():
+ log.Log("Warning: expected %s to be a directory but "
+ "found %s instead.\nThis is probably caused "
+ "by a bug in versions 1.0.0 and earlier." %
+ (filler_rp.path, filler_rp.lstat()), 2)
+ filler_rp.make_zero_dir(rootrp)
yield filler_rp
yield rp
old_index = cur_index