In response to Nelson's bug report, actually give a useful error if a

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-remconffs

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
                """
        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',
                users = [acl.user for acl in machine.acl]
                return "\n".join(map(self.userToPrinc, users)
                                 + ['include /etc/remctl/acl/web',