More fixes to hanging query in cherrypy compat

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

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 3c3d11e..46e5c73 100755 (executable)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -25,14 +25,14 @@ def refreshCache():
     session.begin()
 
     try:
     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 removed in old_admin_acl - admin_acl:
             old = Admin.query.filter_by(user=removed).first()
             session.delete(old)