X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e37dd15bbf8683bab8454ea0eec8e9968ce982b2..e11cdd5476f7f1a456ece94862c211a1b83b093c:/code/cache_acls.py?ds=inline

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 34d5e1e..130f359 100644
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from sipb_xen_database import *
+from invirt.database import *
 import sys
 import getafsgroups
 import subprocess
@@ -27,19 +27,27 @@ def expandName(name):
     if ':' not in name:
         if isUser(name):
             return [name]
-        name = 'system:'+name
-    return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+        return []
+    try:
+        return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+    except getafsgroups.AfsProcessError:
+        return []
 
-def refreshMachine(m):
+def accessList(m):
     people = set()
     people.update(expandLocker(m.owner))
     people.update(expandName(m.administrator))
+    return people
+
+def refreshMachine(m):
+    people = accessList(m)
     old_people = set(a.user for a in m.acl)
     for removed in old_people - people:
         ma = [x for x in m.acl if x.user == removed][0]
         ctx.current.delete(ma)
     for p in people - old_people:
-        ma = MachineAccess(machine_id=m.machine_id, user=p)
+        ma = MachineAccess(user=p)
+        m.acl.append(ma)
         ctx.current.save(ma)
     
 def refreshCache():
@@ -59,5 +67,5 @@ def refreshCache():
         raise
 
 if __name__ == '__main__':
-    connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen')
+    connect()
     refreshCache()