[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Security.py...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/09 03:53:40

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Security.py connection.py rpath.py 

Log message:
        Squash regress/check_pids bug and properly pickle RPath's

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Security.py?cvsroot=rdiff-backup&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/connection.py?cvsroot=rdiff-backup&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.106&r2=1.107

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- CHANGELOG   8 Jul 2007 21:10:02 -0000       1.222
+++ CHANGELOG   9 Jul 2007 03:53:40 -0000       1.223
@@ -1,6 +1,10 @@
 New in v1.1.12 (????/??/??)
 ---------------------------
 
+Squash bug where --check-destination-dir or regress operation failed
+after crash when --force option was not used. RPath's are now
+properly pickled. (Andrew Ferguson)
+
 Workaround for tempfile.TemporaryFile() having different behavior
 on Windows/Cygwin. (Andrew Ferguson)
 

Index: rdiff_backup/Security.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Security.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- rdiff_backup/Security.py    28 Jan 2007 02:47:02 -0000      1.32
+++ rdiff_backup/Security.py    9 Jul 2007 03:53:40 -0000       1.33
@@ -172,6 +172,7 @@
                                  
"backup.DestinationStruct.patch_and_increment",
                                  "Main.backup_touch_curmirror_local",
                                  "Main.backup_remove_curmirror_local",
+                                 "regress.check_pids",
                                  "Globals.ITRB.increment_stat",
                                  "statistics.record_error",
                                  "log.ErrorLog.write_if_open",

Index: rdiff_backup/connection.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/connection.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- rdiff_backup/connection.py  19 Nov 2005 03:10:03 -0000      1.28
+++ rdiff_backup/connection.py  9 Jul 2007 03:53:40 -0000       1.29
@@ -20,7 +20,7 @@
 """Support code for remote execution and data transfer"""
 
 from __future__ import generators
-import types, os, tempfile, cPickle, shutil, traceback, pickle, \
+import types, os, tempfile, cPickle, shutil, traceback, \
           socket, sys, gzip
 # The following EA and ACL modules may be used if available
 try: import xattr
@@ -140,8 +140,7 @@
 
        def _putobj(self, obj, req_num):
                """Send a generic python obj down the outpipe"""
-               # for some reason there is an error when cPickle is used below..
-               self._write("o", pickle.dumps(obj, 1), req_num)
+               self._write("o", cPickle.dumps(obj, 1), req_num)
 
        def _putbuf(self, buf, req_num):
                """Send buffer buf down the outpipe"""

Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- rdiff_backup/rpath.py       20 Jun 2007 13:57:15 -0000      1.106
+++ rdiff_backup/rpath.py       9 Jul 2007 03:53:40 -0000       1.107
@@ -753,17 +753,17 @@
        def __getstate__(self):
                """Return picklable state
 
-               The connection must be local because we can't pickle a
-               connection.  Data and any attached file also won't be saved.
+               The rpath's connection will be encoded as its conn_number.  It
+               and the other information is put in a tuple. Data and any 
attached
+               file won't be saved.
 
                """
-               assert self.conn is Globals.local_connection
-               return (self.index, self.base, self.data)
+               return (self.conn.conn_number, self.base, self.index, self.data)
 
        def __setstate__(self, rpath_state):
                """Reproduce RPath from __getstate__ output"""
-               self.conn = Globals.local_connection
-               self.index, self.base, self.data = rpath_state
+               conn_number, self.base, self.index, self.data = rpath_state
+               self.conn = Globals.connection_dict[conn_number]
                self.path = "/".join((self.base,) + self.index)
 
        def setdata(self):