[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/01/31 16:12:02

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : fs_abilities.py 

Log message:
        Fix --list-increments bug in set_must_escape_dos_devices.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.202&r2=1.203
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.32&r2=1.33

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- CHANGELOG   30 Jan 2007 05:40:44 -0000      1.202
+++ CHANGELOG   31 Jan 2007 16:12:02 -0000      1.203
@@ -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)
 --------------------------
 

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- rdiff_backup/fs_abilities.py        29 Jan 2007 18:42:49 -0000      1.32
+++ rdiff_backup/fs_abilities.py        31 Jan 2007 16:12:02 -0000      1.33
@@ -603,13 +603,16 @@
 
        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"""