Commit 2d5320ae authored by owsla's avatar owsla

Properly handle hardlink comparison when the metadata about a destination

hardlink has become corrupt. Closes Debian bug #486653.


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@908 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 1c409691
New in v1.1.17 (????/??/??) 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 Fix typo in fs_abilities noticed by Martin Krafft. Add EILSEQ ("Invalid or
incomplete multibyte or wide character") to the list of recoverable errors. incomplete multibyte or wide character") to the list of recoverable errors.
Thanks to Hanno Stock for catching that. (Andrew Ferguson) Thanks to Hanno Stock for catching that. (Andrew Ferguson)
......
...@@ -103,7 +103,10 @@ def rorp_eq(src_rorp, dest_rorp): ...@@ -103,7 +103,10 @@ def rorp_eq(src_rorp, dest_rorp):
# subsequent ones # subsequent ones
_inode_index[src_key] = (index, remaining, None, None) _inode_index[src_key] = (index, remaining, None, None)
return 1 return 1
try:
return dest_key == get_inode_key(dest_rorp) 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): def islinked(rorp):
"""True if rorp's index is already linked to something on src side""" """True if rorp's index is already linked to something on src side"""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment