From 983fb79bd981ce343422d292cc0d1d1831a82158 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 4 May 2009 21:17:19 -0400 Subject: [PATCH] In invirt-dhcp: * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if we get a DHCPREQUEST for a MAC address that's not in our database. svn path=/trunk/packages/invirt-dhcp/; revision=2347 --- debian/changelog | 7 +++++++ invirt-dhcpserver | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 935f8c2..ea490a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-dhcp (0.0.2) unstable; urgency=low + + * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if + we get a DHCPREQUEST for a MAC address that's not in our database. + + -- Evan Broder Mon, 04 May 2009 21:14:26 -0400 + invirt-dhcp (0.0.1) unstable; urgency=low * sipb-xen-dhcp -> invirt-dhcp diff --git a/invirt-dhcpserver b/invirt-dhcpserver index 74e554f..04376d0 100755 --- a/invirt-dhcpserver +++ b/invirt-dhcpserver @@ -25,7 +25,7 @@ class DhcpBackend: database.connect() def findNIC(self, mac): database.clear_cache() - return database.NIC.query().filter_by(mac_addr=mac).one() + return database.NIC.query().filter_by(mac_addr=mac).first() def find_interface(self, packet): chaddr = hwmac(packet.GetHardwareAddress()) nic = self.findNIC(str(chaddr)) -- 1.7.9.5