Whoops - I should actually check code after I write it; fix the new RemConfFS

svn path=/trunk/packages/sipb-xen-remote-server/; revision=1011

diff --git a/debian/changelog b/debian/changelog
index c31f1f9..dfab6d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remote-server (0.9.1) unstable; urgency=low
+
+  * Fix a bug in the database handling code
+
+ -- Evan Broder <broder@mit.edu>  Fri, 03 Oct 2008 18:42:48 -0400
+
 sipb-xen-remote-server (0.9) unstable; urgency=low
 
   [Evan Broder]

diff --git a/files/usr/sbin/sipb-xen-remconffs b/files/usr/sbin/sipb-xen-remconffs
index 3f640fc..275ba88 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remconffs
+++ b/files/usr/sbin/sipb-xen-remconffs
@@ -48,7 +48,7 @@ class RemConfFS(routefs.RouteFS):
        def getacl(self, machine, **kw):
                """Build the ACL file for a machine
                """
-               machine = database.Machine.get_by(name=machine)
+               machine = database.Machine.query().filter_by(name=machine).one()
                users = [acl.user for acl in machine.acl]
                return "\n".join(map(self.userToPrinc, users)
                                 + ['include /etc/remctl/acl/web',