diff options
| author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-04-30 02:02:56 +0000 |
|---|---|---|
| committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-04-30 02:02:56 +0000 |
| commit | d49f6dccf43983b317d31aa49b7e9a54aa28bf01 (patch) | |
| tree | 1986d43b549551e12b60b6c03251061eae7bf433 /rdiff-backup/rdiff_backup/highlevel.py | |
| parent | ef22311017db214255b24f93de2a43d75f9d45cc (diff) | |
| download | rdiff-backup-d49f6dccf43983b317d31aa49b7e9a54aa28bf01.tar.gz | |
Changed for 0.7.3 release
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@48 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/highlevel.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/highlevel.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/highlevel.py b/rdiff-backup/rdiff_backup/highlevel.py index 54029c7..5a1399d 100644 --- a/rdiff-backup/rdiff_backup/highlevel.py +++ b/rdiff-backup/rdiff_backup/highlevel.py @@ -73,6 +73,9 @@ class HighLevel: if not isinstance(target_base, DSRPath): target_base = DSRPath(target_base.conn, target_base.base, target_base.index, target_base.data) + if not isinstance(mirror_base, DSRPath): + mirror_base = DSRPath(mirror_base.conn, mirror_base.base, + mirror_base.index, mirror_base.data) Restore.RestoreRecursive(rest_time, mirror_base, rel_index, baseinc_tup, target_base) @@ -272,9 +275,9 @@ class HLDestinationStruct: try: dsrp = cls.check_skip_error(error_checked, dsrp) except StopIteration: break SaveState.checkpoint_inc_backup(ITR, finalizer, dsrp) + cls.check_skip_error(ITR.getresult, dsrp) + cls.check_skip_error(finalizer.getresult, dsrp) except: cls.handle_last_error(dsrp, finalizer, ITR) - ITR.getresult() - finalizer.getresult() if Globals.preserve_hardlinks: Hardlink.final_writedata() SaveState.checkpoint_remove() @@ -288,6 +291,7 @@ class HLDestinationStruct: (exp[0] in [2, # Means that a file is missing 5, # Reported by docv (see list) 13, # Permission denied IOError + 20, # Means a directory changed to non-dir 26] # Requested by Campbell (see list) - # happens on some NT systems ))): |