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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/07/05 19:04:44

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : rpath.py 

Log message:
        Properly handle uid/gid comparison when the metadata about a destination
        file has become corrupt. Closes Debian bug #410586.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.286&r2=1.287
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.123&r2=1.124

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- CHANGELOG   4 Jul 2008 15:00:38 -0000       1.286
+++ CHANGELOG   5 Jul 2008 19:04:44 -0000       1.287
@@ -1,6 +1,9 @@
 New in v1.1.17 (????/??/??)
 ---------------------------
 
+Properly handle uid/gid comparison when the metadata about a destination
+file has become corrupt. Closes Debian bug #410586. (Andrew Ferguson)
+
 Properly handle hardlink comparison when the metadata about a destination
 hardlink has become corrupt. Closes Debian bug #486653. (Andrew Ferguson)
 

Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- rdiff_backup/rpath.py       2 Jul 2008 18:15:52 -0000       1.123
+++ rdiff_backup/rpath.py       5 Jul 2008 19:04:44 -0000       1.124
@@ -412,7 +412,10 @@
 
                if self.lstat() and not self.issym() and 
Globals.change_ownership:
                        # Now compare ownership.  Symlinks don't have ownership
+                       try:
                        if user_group.map_rpath(self) != other.getuidgid(): 
return 0
+                       except KeyError:
+                               return 0 # uid/gid might be missing if metadata 
file is corrupt
 
                return 1