Correct the incomplete fix from r1155

[invirt/packages/invirt-web.git] / code / cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
index fa9b9f9..8cd6977 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -6,7 +6,13 @@ import getafsgroups
 import subprocess
 
 def expandLocker(name):
 import subprocess
 
 def expandLocker(name):

-    groups = getafsgroups.getLockerAcl(name)
+    try:
+        groups = getafsgroups.getLockerAcl(name)
+    except getafsgroups.AfsProcessError, e:
+        if e.message.startswith("fs: You don't have the required access rights on"):
+            groups = []
+        else:
+            raise

     cell = getafsgroups.getCell(name)
     ans = set()
     for group in groups:
     cell = getafsgroups.getCell(name)
     ans = set()
     for group in groups:

@@ -37,7 +43,8 @@ def expandName(name):
 def accessList(m):
     people = set()
     people.update(expandLocker(m.owner))
 def accessList(m):
     people = set()
     people.update(expandLocker(m.owner))

-    people.update(expandName(m.administrator))
+    if m.administrator is not None:
+        people.update(expandName(m.administrator))

     return people
 
 def refreshMachine(m):
     return people
 
 def refreshMachine(m):