[Rdiff-backup-commits] Changes to rdiff-backup/rdiff_backup/eas_acls.py

[Ben Escoto]

Index: rdiff-backup/rdiff_backup/eas_acls.py
diff -u rdiff-backup/rdiff_backup/eas_acls.py:1.14 
rdiff-backup/rdiff_backup/eas_acls.py:1.15
--- rdiff-backup/rdiff_backup/eas_acls.py:1.14  Mon Oct 24 17:16:05 2005
+++ rdiff-backup/rdiff_backup/eas_acls.py       Tue Oct 25 02:38:16 2005
@@ -458,24 +458,15 @@
                                "trigger further warnings" % (name,), 2)
                dropped_acl_names[name] = name
 
-       def map_id_name(owner_pair, group = None):
-               """Return id of mapped id and user given original owner_pair"""
-               id, name = owner_pair
-               Map = group and user_group.GroupMap or user_group.UserMap
-               if name: return Map.get_id_from_name(name)
-               else:
-                       assert id is not None
-                       return Map.get_id_from_id(id)
-
        acl = posix1e.ACL()
        for typechar, owner_pair, perms in entry_list:
                id = None
                if owner_pair:
                        if map_names:
-                               if typechar == "u": id = 
map_id_name(owner_pair, 0)
+                               if typechar == "u": id = 
user_group.acl_user_map(*owner_pair)
                                else:
                                        assert typechar == "g", (typechar, 
owner_pair, perms)
-                                       id = map_id_name(owner_pair, 1)
+                                       id = 
user_group.acl_group_map(*owner_pair)
                                if id is None:
                                        warn_drop(owner_pair[1])
                                        continue