mtest: Provide for sedderyb

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 4be0160f8e2d5a8564f8da3dc593d5464de563a2..4826a445caa5604ca2c61f75a3dc1c8730bc8cf1 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -417,7 +417,7 @@ class level:
        def prop_out(self,n):
                return self.allow_properties[n](n,str(self.properties[n]))
        def output_props(self,w,ind):
-               for i in self.properties.keys():
+               for i in sorted(self.properties.keys()):
                        if self.allow_properties[i]:
                                self.indent(w,ind)
                                w.write("%s"%self.prop_out(i))
@@ -430,7 +430,8 @@ class level:
                w.write("%s {\n"%(self.kname()))
                self.output_props(w,ind+2)
                if self.depth==1: w.write("\n");
-               for c in self.children.values():
+               for k in sorted(self.children.keys()):
+                       c=self.children[k]
                        c.output_data(w,path+(c,))
                self.indent(w,ind)
                w.write("};\n")
@@ -533,11 +534,6 @@ class sitelevel(level):
 # (depth,properties)
 levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 
-# Reserved vpn/location/site names
-reserved={'all-sites':None}
-reserved.update(keywords)
-reserved.update(levels)
-
 def complain(msg):
        "Complain about a particular input line"
        global complaints