invirt-cache-acls: get afs cell list from invirt-config

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

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 414f2e3..7634b7e 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -6,7 +6,12 @@ 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 = []
+        raise

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

@@ -37,7 +42,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):

@@ -55,7 +61,7 @@ def refreshCache():
     session.begin()
 
     try:
     session.begin()
 
     try:

-        machines = Machine.select()
+        machines = Machine.query().all()

         for m in machines:
             refreshMachine(m)
         session.flush()
         for m in machines:
             refreshMachine(m)
         session.flush()