Changeset 10825 in genesis for tools

Timestamp:

May 13, 2012, 12:22:59 PM (13 years ago)

Author:

rick

Message:

Sigh, coffee before commit (or unit-test, properly).

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -465 +465 @@
       (ip, cidr) = datadump[iface_key]['ip'].split('/')
       datadump[iface_key]['netmask'] = cidr2netmask(cidr)
-    except (AttributeError, ValueError):
+    except (AttributeError, ValueError, KeyError):
       output += "# not autoritive\n\n"
       continue
@@ -1081 +1081 @@
         for i in range(int(dhcp_start), int(dhcp_stop) + 1):
           wleiden_zone["dhcp-%s-%s.%s" % (i, iface_name, fqdn)].append(("%s.%s" % (dhcp_part, i), True))
-      except (AttributeError, ValueError):
+      except (AttributeError, ValueError, KeyError):
         # First push it into a pool, to indentify the counter-part later on
         addr = parseaddr(ip)