Changeset 2347

Timestamp:

May 4, 2009, 9:17:19 PM (16 years ago)

Author:

broder

Message:

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.

Location:

trunk/packages/invirt-dhcp

Files:

• debian/changelog (modified) (1 diff)
• invirt-dhcpserver (modified) (1 diff)

trunk/packages/invirt-dhcp/debian/changelog

@@ +1 @@
+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 <broder@mit.edu>  Mon, 04 May 2009 21:14:26 -0400
+
 invirt-dhcp (0.0.1) unstable; urgency=low
 

trunk/packages/invirt-dhcp/invirt-dhcpserver

@@ -26 +26 @@
     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())