Fixes #936 - Fix setacl command exception
Florent Viard authored on 2018/03/04 04:06:10... | ... |
@@ -26,7 +26,7 @@ class Grantee(object): |
26 | 26 |
self.xsi_type = None |
27 | 27 |
self.tag = None |
28 | 28 |
self.name = None |
29 |
- self.display_name = None |
|
29 |
+ self.display_name = '' |
|
30 | 30 |
self.permission = None |
31 | 31 |
|
32 | 32 |
def __repr__(self): |
... | ... |
@@ -188,8 +188,8 @@ class ACL(object): |
188 | 188 |
if "ALL" == permission: |
189 | 189 |
self.grantees = [g for g in self.grantees if not (g.name.lower() == name or g.display_name.lower() == name)] |
190 | 190 |
else: |
191 |
- self.grantees = [g for g in self.grantees if not ((g.display_name.lower() == name and g.permission.upper() == permission)\ |
|
192 |
- or (g.name.lower() == name and g.permission.upper() == permission))] |
|
191 |
+ self.grantees = [g for g in self.grantees if not ((g.display_name.lower() == name or g.name.lower() == name) |
|
192 |
+ and g.permission.upper() == permission)] |
|
193 | 193 |
|
194 | 194 |
def get_printable_tree(self): |
195 | 195 |
tree = getTreeFromXml(ACL.EMPTY_ACL) |