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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/08 21:10:02

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : librsync.py 

Log message:
        Workaround for tempfile.TemporaryFile() having different behavior
        on Windows/Cygwin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/librsync.py?cvsroot=rdiff-backup&r1=1.5&r2=1.6

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- CHANGELOG   7 Jul 2007 19:58:36 -0000       1.221
+++ CHANGELOG   8 Jul 2007 21:10:02 -0000       1.222
@@ -1,6 +1,9 @@
 New in v1.1.12 (????/??/??)
 ---------------------------
 
+Workaround for tempfile.TemporaryFile() having different behavior
+on Windows/Cygwin. (Andrew Ferguson)
+
 Make --check-destination-dir handle quoted situations. (Andrew Ferguson)
 
 Handle quoted current_mirror markers and clean-up the listing of

Index: rdiff_backup/librsync.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/librsync.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- rdiff_backup/librsync.py    27 Oct 2005 06:16:39 -0000      1.5
+++ rdiff_backup/librsync.py    8 Jul 2007 21:10:02 -0000       1.6
@@ -152,6 +152,8 @@
 
                """
                LikeFile.__init__(self, delta_file)
+               if hasattr(basis_file, 'file'):
+                       basis_file = basis_file.file
                if type(basis_file) is not types.FileType:
                        raise TypeError("basis_file must be a (true) file")
                try: self.maker = _librsync.new_patchmaker(basis_file)