diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-21 01:29:18 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-21 01:29:18 +0000 |
commit | 5015e6c7a84243200c00c467d892b1b2105ee9bb (patch) | |
tree | 46a6533237dbe77d60c46ac319730b80c0dd7d79 /rdiff-backup/rdiff_backup/rorpiter.py | |
parent | f4da6ca2f3034ae3d5cd08062bb5d964f63789af (diff) | |
download | rdiff-backup-5015e6c7a84243200c00c467d892b1b2105ee9bb.tar.gz |
Fixed quoted hardlinks, added --windows-restore, fixed a couple tests
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@320 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rorpiter.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/rorpiter.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/rdiff-backup/rdiff_backup/rorpiter.py b/rdiff-backup/rdiff_backup/rorpiter.py index 7db4fea..d683650 100644 --- a/rdiff-backup/rdiff_backup/rorpiter.py +++ b/rdiff-backup/rdiff_backup/rorpiter.py @@ -30,7 +30,7 @@ files), where files is the number of files attached (usually 1 or from __future__ import generators import os, tempfile, UserList, types -import Globals, rpath, iterfile +import Globals, rpath, iterfile, log def CollateIterators(*rorp_iters): @@ -266,16 +266,20 @@ class IterTreeReducer: else: self.root_branch.start_process(*args) self.index = index return 1 - assert index > self.index, "Index out of order" - - if self.finish_branches(index) is None: - return None # We are no longer in the main tree - last_branch = self.branches[-1] - if last_branch.can_fast_process(*args): - last_branch.fast_process(*args) - else: - branch = self.add_branch(index) - branch.start_process(*args) + if index == self.index: + log.Log("Warning, repeated index %s, bad filesystem?" + % (index,), 2) + elif index < self.index: + assert 0, "Bad index order: %s >= %s" % (self.index, index) + else: # normal case + if self.finish_branches(index) is None: + return None # We are no longer in the main tree + last_branch = self.branches[-1] + if last_branch.can_fast_process(*args): + last_branch.fast_process(*args) + else: + branch = self.add_branch(index) + branch.start_process(*args) self.index = index return 1 |