diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-01-14 03:58:42 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-01-14 03:58:42 +0000 |
commit | aa5468939fa402e375eea52c4da9b3e46e440d30 (patch) | |
tree | 322806daca763f1124d293b304abb3f5b3cfd913 | |
parent | cb1247fcc2396b3ffc7c9cafadfb519670f2c7ba (diff) | |
download | rdiff-backup-aa5468939fa402e375eea52c4da9b3e46e440d30.tar.gz |
Remy Blank's ACL non-existing uname bug
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-0@746 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/user_group.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 6935381..26bcbc4 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -11,6 +11,9 @@ Selection fix: empty directories could sometimes be improperly excluded if certain include expressions involving a non-trailing '**' were used. Bug reported by Toni Price. +Bug #15436 reported by Remy Blank: rdiff-backup would sometimes crash +if ACLs and uname did not exist on destination. + New in v1.0.3 (2005/11/25) -------------------------- diff --git a/rdiff-backup/rdiff_backup/user_group.py b/rdiff-backup/rdiff_backup/user_group.py index 9209daf..a42b9a6 100644 --- a/rdiff-backup/rdiff_backup/user_group.py +++ b/rdiff-backup/rdiff_backup/user_group.py @@ -92,7 +92,7 @@ class Map: try: return self.name2id_dict[name] except KeyError: out_id = self.find_id_from_name(name) - self.name2id_dict[name] = out_id + if out_id is not None: self.name2id_dict[name] = out_id return out_id def get_id_from_id(self, id): return id |