diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-05 19:04:44 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-07-05 19:04:44 +0000 |
| commit | a09b3da119ee795d91436049bf0c75701d07aaa7 (patch) | |
| tree | 11db341df2360efcdb9cd1043d84399226c18b16 | |
| parent | cb67046728b09d2f9e36ce106f82524b10bf3e3a (diff) | |
| download | rdiff-backup-a09b3da119ee795d91436049bf0c75701d07aaa7.tar.gz | |
Properly handle uid/gid comparison when the metadata about a destination
file has become corrupt. Closes Debian bug #410586.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@909 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 7f60689..975a975 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -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) diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 8871f47..2ee7043 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -412,7 +412,10 @@ class RORPath: if self.lstat() and not self.issym() and Globals.change_ownership: # Now compare ownership. Symlinks don't have ownership - if user_group.map_rpath(self) != other.getuidgid(): return 0 + 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 |