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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/08/09 13:32:16

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : FilenameMapping.py regress.py 

Log message:
        Properly pickle QuotedRPaths

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.239&r2=1.240
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/FilenameMapping.py?cvsroot=rdiff-backup&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/regress.py?cvsroot=rdiff-backup&r1=1.20&r2=1.21

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- CHANGELOG   9 Aug 2007 13:28:20 -0000       1.239
+++ CHANGELOG   9 Aug 2007 13:32:16 -0000       1.240
@@ -1,6 +1,9 @@
 New in v1.1.13 (????/??/??)
 ---------------------------
 
+Properly pickle QuotedRPaths. Fixes regress operation on quoted filesystems.
+Closes Savannah bug #20570 reported by Morgan Read. (Andrew Ferguson)
+
 Warn if can't write extended attribute. (Andrew Ferguson)
 
 Gracefully handle situations where rdiff-backup tries to set the sticky

Index: rdiff_backup/FilenameMapping.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/FilenameMapping.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- rdiff_backup/FilenameMapping.py     11 Jul 2007 19:18:46 -0000      1.11
+++ rdiff_backup/FilenameMapping.py     9 Aug 2007 13:32:16 -0000       1.12
@@ -126,6 +126,13 @@
                rpath.RPath.__init__(self, connection, base, self.quoted_index, 
data)
                self.index = index
 
+       def __setstate__(self, rpath_state):
+               """Reproduce QuotedRPath from __getstate__ output"""
+               conn_number, self.base, self.index, self.data = rpath_state
+               self.conn = Globals.connection_dict[conn_number]
+               self.quoted_index = tuple(map(quote, self.index))
+               self.path = "/".join((self.base,) + self.quoted_index)
+
        def listdir(self):
                """Return list of unquoted filenames in current directory
 

Index: rdiff_backup/regress.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/regress.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- rdiff_backup/regress.py     6 Mar 2007 18:58:37 -0000       1.20
+++ rdiff_backup/regress.py     9 Aug 2007 13:32:16 -0000       1.21
@@ -345,7 +345,7 @@
                try: os.kill(pid, 0)
                except OSError, exc:
                        if exc[0] == errno.ESRCH: return 0
-                       else: Log("Warning: unable to check if PID %d still 
running" % (pid,), 2)
+                       else: log.Log("Warning: unable to check if PID %d still 
running" % (pid,), 2)
                return 1
 
        for curmir_rp in curmir_incs: