create disks as hda instead of xvda so as to avoid breaking qemu-dm

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

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 46e5c73..43af7dd 100755 (executable)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -19,7 +19,7 @@ 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()
 
 def refreshCache():
     session.begin()

@@ -38,7 +38,7 @@ def refreshCache():
             session.delete(old)
         for added in admin_acl - old_admin_acl:
             a = Admin(user=added)
             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