[Rdiff-backup-commits] rdiff-backup/rdiff_backup FilenameMapping.py fs...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/11/13 01:14:59

Modified files:
        rdiff_backup   : FilenameMapping.py fs_abilities.py 

Log message:
        Final fixes to trailing spaces support

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/FilenameMapping.py?cvsroot=rdiff-backup&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.57&r2=1.58

Patches:
Index: FilenameMapping.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/FilenameMapping.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- FilenameMapping.py  13 Nov 2008 00:15:56 -0000      1.15
+++ FilenameMapping.py  13 Nov 2008 01:14:59 -0000      1.16
@@ -89,11 +89,9 @@
                        and not Globals.must_escape_trailing_spaces:
                return QuotedPath
 
-       if Globals.must_escape_dos_devices:
-               assert Globals.must_escape_trailing_spaces
-
        # Escape a trailing space or period (invalid in names on FAT32 under 
DOS,
        # Windows and modern Linux)
+       if Globals.must_escape_trailing_spaces:
        if len(QuotedPath) and (QuotedPath[-1] == ' ' or QuotedPath[-1] == '.'):
                QuotedPath = QuotedPath[:-1] + \
                                "%s%03d" % (quoting_char, ord(QuotedPath[-1]))

Index: fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- fs_abilities.py     13 Nov 2008 00:32:10 -0000      1.57
+++ fs_abilities.py     13 Nov 2008 01:14:59 -0000      1.58
@@ -586,7 +586,7 @@
                                log.Log("escape_trailing_spaces required by 
filesystem at %s" \
                                                % (subdir.path), 4)
                                self.escape_trailing_spaces = 1 
-               except(OSError):
+               except (OSError, IOError):
                        log.Log("escape_trailing_spaces required by filesystem 
at %s" \
                                        % (subdir.path), 4)
                        self.escape_trailing_spaces = 1
@@ -707,7 +707,8 @@
                                space_rp.delete()
                        else:
                                local_ets = 1
-               except (OSError): local_ets = 1
+               except (OSError, IOError):
+                       local_ets = 1
                SetConnections.UpdateGlobal('must_escape_trailing_spaces', \
                        self.src_fsa.escape_trailing_spaces or local_ets)
                log.Log("Backup: must_escape_trailing_spaces = %d" % \
@@ -839,7 +840,8 @@
                                space_rp.delete()
                        else:
                                local_ets = 1
-               except (OSError): local_ets = 1
+               except (OSError, IOError):
+                       local_ets = 1
                SetConnections.UpdateGlobal('must_escape_trailing_spaces', \
                        src_ets or local_ets)
                log.Log("Restore: must_escape_trailing_spaces = %d" % \