Changeset 14055 in genesis

Timestamp:

Feb 20, 2018, 7:06:24 PM (7 years ago)

Author:

rick

Message:

Fix merge errors of r14053 and r14054 commits

File:

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

tools/gformat.py

@@ -237 +237 @@
             datadump[key]['autogen_vlan_alias'] = '_alias' in key
             datadump[key]['autogen_iface'] = '.'.join(key.split('_')[1:])
-            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifname']
           else:
             datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
             datadump[key]['autogen_iface'] = '_'.join(key.split('_')[1:])
-            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
 
     except Exception as exc:
@@ -615 +613 @@
   # Output the blocks in groups
   for ifname,value in sorted(dhcp_out.iteritems()):
-      output += ("shared-network %s {\n" % ifname) + indent(''.join(value), 2).rstrip()  + '\n}\n\n'
+      output += ("shared-network \"%s\" {\n" % ifname) + indent(''.join(value), 2).rstrip()  + '\n}\n\n'
   return output