From: Evan Broder <broder@mit.edu>
Date: Sat, 4 Oct 2008 00:45:49 +0000 (-0400)
Subject: Update SQLAlchemy code in sipb-xen-dns
X-Git-Tag: sipb-xen-dns/1.06^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/commitdiff_plain/c222800f93e407a18292cab69564b24ac0965459

Update SQLAlchemy code in sipb-xen-dns

svn path=/trunk/packages/sipb-xen-dns/; revision=1018
---

diff --git a/debian/changelog b/debian/changelog
index b740c85..1079e03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-dns (1.06) unstable; urgency=low
+
+  * Fix the SQLAlchemy calls
+
+ -- Evan Broder <broder@mit.edu>  Fri, 03 Oct 2008 20:44:23 -0400
+
 sipb-xen-dns (1.05.1) unstable; urgency=low
 
   * Include the requirement on twisted.names
diff --git a/files/usr/sbin/sipb-xen-dns b/files/usr/sbin/sipb-xen-dns
index 58d52da..bbabebf 100755
--- a/files/usr/sbin/sipb-xen-dns
+++ b/files/usr/sbin/sipb-xen-dns
@@ -109,7 +109,7 @@ class DatabaseAuthority(common.ResolverBase):
                         [dns.RRHeader(name, dns.CNAME, dns.IN, ttl, record, auth=True)],
                         [], []))
 
-                value = invirt.database.Machine.get_by(name=host)
+                value = invirt.database.Machine.query().filter_by(name=host).one()
                 if value is None or not value.nics:
                     return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
                 ip = value.nics[0].ip