Start tracking the membership of the adminacl setting in the admins table.

svn path=/trunk/packages/invirt-web/; revision=2223

diff --git a/code/cache_acls.py b/code/cache_acls.py
old mode 100644 (file)
new mode 100755 (executable)
index fe69815..e18b3d0
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -70,6 +70,16 @@ def refreshCache():
             refreshMachine(m)
         session.flush()
             
             refreshMachine(m)
         session.flush()
             

+        # Update the admin ACL as well
+        admin_acl = set(expandName(config.adminacl))
+        old_admin_acl = set(a.user for a in Admin.query())
+        for removed in old_admin_acl - admin_acl:
+            Admin.query.filter_by(user=removed).delete()
+        for added in admin_acl - old_admin_acl:
+            a = Admin(user=added)
+            session.save_or_update(a)
+        session.flush()
+    

         # Atomically execute our changes
         session.commit()
     except:
         # Atomically execute our changes
         session.commit()
     except: