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 1a23587..8cd6977 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -11,7 +11,8 @@ def expandLocker(name):
     except getafsgroups.AfsProcessError, e:
         if e.message.startswith("fs: You don't have the required access rights on"):
             groups = []
-        raise
+        else:
+            raise
     cell = getafsgroups.getCell(name)
     ans = set()
     for group in groups:
@@ -42,7 +43,8 @@ def expandName(name):
 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):