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/backup.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/backup.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/backup.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py index cd46c5e..36a207d 100644 --- a/rdiff-backup/rdiff_backup/backup.py +++ b/rdiff-backup/rdiff_backup/backup.py @@ -283,8 +283,12 @@ class CacheCollatedPostProcess: """Remove one element from cache, possibly adding it to metadata""" first_index = self.cache_indicies[0] del self.cache_indicies[0] - old_source_rorp, old_dest_rorp, changed_flag, success_flag, inc = \ - self.cache_dict[first_index] + try: (old_source_rorp, old_dest_rorp, changed_flag, + success_flag, inc) = self.cache_dict[first_index] + except KeyError: # probably caused by error in file system (dup) + log.Log("Warning index %s missing from CCPP cache" % + (first_index,),2) + return del self.cache_dict[first_index] self.post_process(old_source_rorp, old_dest_rorp, changed_flag, success_flag, inc) |