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

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/07/04 15:00:39

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Hardlink.py 

Log message:
        Properly handle hardlink comparison when the metadata about a 
destination
        hardlink has become corrupt. Closes Debian bug #486653.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.285&r2=1.286
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Hardlink.py?cvsroot=rdiff-backup&r1=1.14&r2=1.15

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- CHANGELOG   4 Jul 2008 02:10:48 -0000       1.285
+++ CHANGELOG   4 Jul 2008 15:00:38 -0000       1.286
@@ -1,6 +1,9 @@
 New in v1.1.17 (????/??/??)
 ---------------------------
 
+Properly handle hardlink comparison when the metadata about a destination
+hardlink has become corrupt. Closes Debian bug #486653. (Andrew Ferguson)
+
 Fix typo in fs_abilities noticed by Martin Krafft. Add EILSEQ ("Invalid or
 incomplete multibyte or wide character") to the list of recoverable errors.
 Thanks to Hanno Stock for catching that. (Andrew Ferguson)

Index: rdiff_backup/Hardlink.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Hardlink.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- rdiff_backup/Hardlink.py    24 Dec 2005 20:02:05 -0000      1.14
+++ rdiff_backup/Hardlink.py    4 Jul 2008 15:00:38 -0000       1.15
@@ -103,7 +103,10 @@
                # subsequent ones
                _inode_index[src_key] = (index, remaining, None, None)
                return 1
+       try:
        return dest_key == get_inode_key(dest_rorp)
+       except KeyError:
+               return 0 # Inode key might be missing if the metadata file is 
corrupt
 
 def islinked(rorp):
        """True if rorp's index is already linked to something on src side"""