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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/01/26 19:30:23

Modified files:
        rdiff_backup   : backup.py 

Log message:
        Whoops. Previous fix was incorrect -- it assumed that all of the nested
        directories would be updated during the backup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/backup.py?cvsroot=rdiff-backup&r1=1.43&r2=1.44

Patches:
Index: backup.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/backup.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- backup.py   26 Jan 2008 19:15:00 -0000      1.43
+++ backup.py   26 Jan 2008 19:30:23 -0000      1.44
@@ -651,16 +651,13 @@
                """Finish processing directory"""
                if self.dir_update:
                        assert self.base_rp.isdir()
+                       rpath.copy_attribs(self.dir_update, self.base_rp)
 
                        if (Globals.process_uid != 0 and
                                        self.dir_update.getperms() % 01000 < 
0700):
-                               # Directory's permissions were adjusted at the 
start to
-                               # make it readable -- remove it from the list 
since they
-                               # will be reset by the copy_attribs() call
-                               self.CCPP.dir_perms_list.remove((self.base_rp,
-                                       self.dir_update.getperms()))
-
-                       rpath.copy_attribs(self.dir_update, self.base_rp)
+                               # Directory was unreadable at start -- keep it 
readable
+                               # until the end of the backup process.
+                               self.base_rp.chmod(0700 | 
self.dir_update.getperms())
                elif self.dir_replacement:
                        self.base_rp.rmdir()
                        if self.dir_replacement.lstat():