sqlalchemy fixes to get web to display

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

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 3c3d11e..43af7dd 100755 (executable)
--- 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)
     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:
 
 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))
         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)
         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
         session.flush()
     
         # Atomically execute our changes