X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/4968927e695e31396ba840f07a61fab1424c5c76..45cc4357dad4c486b8f67a937fb3afa91fcfa09d:/code/cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 2b3fd6c..1a23587 100644
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -6,7 +6,12 @@ import getafsgroups
 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:
@@ -45,26 +50,26 @@ def refreshMachine(m):
     old_people = set(a.user for a in m.acl)
     for removed in old_people - people:
         ma = [x for x in m.acl if x.user == removed][0]
-        ctx.current.delete(ma)
+        session.delete(ma)
     for p in people - old_people:
         ma = MachineAccess(user=p)
         m.acl.append(ma)
-        ctx.current.save(ma)
+        session.save_or_update(ma)
     
 def refreshCache():
-    transaction = ctx.current.create_transaction()
+    session.begin()
 
     try:
-        machines = Machine.select()
+        machines = Machine.query().all()
         for m in machines:
             refreshMachine(m)
-        ctx.current.flush()
+        session.flush()
             
         # Atomically execute our changes
-        transaction.commit()
+        session.commit()
     except:
         # Failed! Rollback all the changes.
-        transaction.rollback()
+        session.rollback()
         raise
 
 if __name__ == '__main__':