X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/a2945267e85c20e2cec87ca5fb470bf51fecfada..3d6414330881304f5ab21d70df3a228d370843df:/code/cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 3c3d11e..43af7dd 100755
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -19,26 +19,26 @@ def refreshMachine(m):
     for p in people - old_people:
         ma = MachineAccess(user=p)
         m.acl.append(ma)
-        session.save_or_update(ma)
+        session.add(ma)
 
 def refreshCache():
     session.begin()
 
     try:
-        machines = Machine.query().all()
+        machines = Machine.query.all()
         for m in machines:
             refreshMachine(m)
         session.flush()
 
         # Update the admin ACL as well
         admin_acl = set(authz.expandAdmin(config.adminacl))
-        old_admin_acl = set(a.user for a in Admin.query())
+        old_admin_acl = set(a.user for a in Admin.query)
         for removed in old_admin_acl - admin_acl:
             old = Admin.query.filter_by(user=removed).first()
             session.delete(old)
         for added in admin_acl - old_admin_acl:
             a = Admin(user=added)
-            session.save_or_update(a)
+            session.add(a)
         session.flush()
     
         # Atomically execute our changes