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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/05/09 13:06:30

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : regress.py 

Log message:
        Finally fix 'No such file or directory' bug when attempting to regress 
after
        a failed backup. (Patch from Josh Nisly)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.267&r2=1.268
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/regress.py?cvsroot=rdiff-backup&r1=1.22&r2=1.23

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- CHANGELOG   24 Apr 2008 17:08:32 -0000      1.267
+++ CHANGELOG   9 May 2008 13:06:30 -0000       1.268
@@ -1,6 +1,9 @@
 New in v1.1.16 (????/??/??)
 ---------------------------
 
+Finally fix 'No such file or directory' bug when attempting to regress after
+a failed backup. (Patch from Josh Nisly)
+
 Improve Unicode support by escaping Unicode characters in filenames
 when printing them in log messages from eas_acls.py. (Fix from
 Saptarshi Guha)

Index: rdiff_backup/regress.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/regress.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- rdiff_backup/regress.py     23 Dec 2007 02:48:41 -0000      1.22
+++ rdiff_backup/regress.py     9 May 2008 13:06:30 -0000       1.23
@@ -141,8 +141,9 @@
        the reverse.
 
        """
-       temprp = TempFile.new_in_dir(Globals.rbdir)
-       writer = metadata.MetadataFile(temprp, 'w', check_path = 0)
+       temprp = [TempFile.new_in_dir(Globals.rbdir)]
+       def callback(rp): temprp[0] = rp
+       writer = metadata.MetadataFile(temprp[0], 'w', check_path = 0, callback 
= callback)
        for rorp in meta_manager.get_meta_at_time(regress_time, None):
                writer.write_object(rorp)
        writer.close()
@@ -150,7 +151,7 @@
        finalrp = Globals.rbdir.append("mirror_metadata.%s.snapshot.gz" %
                                                                   
Time.timetostring(regress_time))
        assert not finalrp.lstat(), finalrp
-       rpath.rename(temprp, finalrp)
+       rpath.rename(temprp[0], finalrp)
        if Globals.fsync_directories: Globals.rbdir.fsync()
 
 def iterate_raw_rfs(mirror_rp, inc_rp):