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

[Andrew Ferguson]

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

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : backup.py 

Log message:
        When unreadable dirs are updated, remove them from the list of dirs 
whose
        permissions need to be reset later since we do it during the backup.

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

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -b -r1.261 -r1.262
--- CHANGELOG   21 Jan 2008 21:16:40 -0000      1.261
+++ CHANGELOG   26 Jan 2008 19:15:00 -0000      1.262
@@ -1,6 +1,10 @@
 New in v1.1.16 (????/??/??)
 ---------------------------
 
+Correctly handle updates to nested directories with unreadable permissions.
+Thanks to John Goerzen for the bug report. Closes Debian bugs #389134 and
+#411849. (Andrew Ferguson)
+
 Manpage improvements from Justin Pryzby.
 
 Improve the handling of directories with many small files when backing-up

Index: rdiff_backup/backup.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/backup.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- rdiff_backup/backup.py      20 Jan 2008 16:38:12 -0000      1.42
+++ rdiff_backup/backup.py      26 Jan 2008 19:15:00 -0000      1.43
@@ -651,6 +651,15 @@
                """Finish processing directory"""
                if self.dir_update:
                        assert self.base_rp.isdir()
+
+                       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)
                elif self.dir_replacement:
                        self.base_rp.rmdir()