[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> 07/12/23 02:48:41

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : regress.py 

Log message:
        Regress.restore_orig_regfile should check Globals.fsync_directories 
Fixes
        bug #21546

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

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- CHANGELOG   14 Aug 2007 19:47:47 -0000      1.246
+++ CHANGELOG   23 Dec 2007 02:48:41 -0000      1.247
@@ -1,6 +1,9 @@
 New in v1.1.15 (????/??/??)
 ---------------------------
 
+Regress.restore_orig_regfile should check if directories can be fsync'd
+before doing so. Fixes Savannah bug #21546. (Patch from Marc Horowitz)
+
 Rewrite quoting logic to independently check for escaping Windows special
 characters, non-ASCII chars, and uppercase chars. (Andrew Ferguson)
 

Index: rdiff_backup/regress.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/regress.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- rdiff_backup/regress.py     9 Aug 2007 13:32:16 -0000       1.21
+++ rdiff_backup/regress.py     23 Dec 2007 02:48:41 -0000      1.22
@@ -294,7 +294,8 @@
                        if rf.mirror_rp.lstat(): rf.mirror_rp.delete()
                        rf.mirror_rp.write_from_fileobj(rf.get_restore_fp())
                        rpath.copy_attribs(rf.metadata_rorp, rf.mirror_rp)
-               rf.mirror_rp.get_parent_rp().fsync() # require move before inc 
delete
+               if Globals.fsync_directories:
+                       rf.mirror_rp.get_parent_rp().fsync() # force move 
before inc delete
 
        def start_process(self, index, rf):
                """Start processing directory"""