diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-01-31 16:12:02 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-01-31 16:12:02 +0000 |
| commit | 6ded1bae81c7e4af5773dabe583a6690c7061edc (patch) | |
| tree | 019294ecb97144a930782a273b96f441345e874d | |
| parent | 7ea8aa371238246cbaf16537e8631786e21ed7ae (diff) | |
| download | rdiff-backup-6ded1bae81c7e4af5773dabe583a6690c7061edc.tar.gz | |
Fix --list-increments bug in set_must_escape_dos_devices.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@792 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 7 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/fs_abilities.py | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 4d20e53..0bc153d 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,3 +1,10 @@ +New in v1.1.10 (????/??/??) +--------------------------- + +Fix --list-increments bug in set_escape_dos_devices. (Marc +Dyksterhouse) + + New in v1.1.9 (2007/01/29) -------------------------- diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py index 17a890d..e6534de 100644 --- a/rdiff-backup/rdiff_backup/fs_abilities.py +++ b/rdiff-backup/rdiff_backup/fs_abilities.py @@ -603,13 +603,16 @@ class RestoreSetGlobals(SetGlobals): def set_must_escape_dos_devices(self, rbdir): """If local edd or src edd, then must escape """ + if getattr(self, "src_fsa", None) is not None: + src_edd = self.src_fsa.escape_dos_devices + else: src_edd = 0 device_rp = rbdir.append("aux") if device_rp.lstat(): local_edd = 1 else: local_edd = 0 SetConnections.UpdateGlobal('must_escape_dos_devices', \ - self.src_fsa.escape_dos_devices or local_edd) + src_edd or local_edd) log.Log("Restore: must_escape_dos_devices = %d" % \ - (self.src_fsa.escape_dos_devices or local_edd), 4) + (src_edd or local_edd), 4) def set_chars_to_quote(self, rbdir): """Set chars_to_quote from rdiff-backup-data dir""" |