Fix trivial-validate to work without f attribute.

jsha · jsha · commit c5dead506e00 · 2016-01-13T23:29:07.000-08:00
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -160,7 +160,6 @@ def nomes_all(where=sys.argv[1:]):
 
 xpath_ruleset = etree.XPath("/ruleset")
 xpath_ruleset_name = etree.XPath("/ruleset/@name")
-xpath_ruleset_file = etree.XPath("/ruleset/@f")
 xpath_host = etree.XPath("/ruleset/target/@host")
 xpath_from = etree.XPath("/ruleset/rule/@from")
 xpath_to = etree.XPath("/ruleset/rule/@to")
@@ -180,13 +179,12 @@ def nomes_all(where=sys.argv[1:]):
         failure = 1
         fail("unnamed ruleset")
         continue
-    rf = xpath_ruleset_file(tree)[0]
     from_attrib = xpath_from(tree)
     to = xpath_to(tree)
     for test in tests:
         if not test(tree, rn, from_attrib=from_attrib, to=to):
             failure = 1
-            fail("%s failed test: %s" % (rf, test.__doc__))
+            fail("%s failed test: %s" % (rn, test.__doc__))
 
 for (host, count) in c.execute('''
   select host, count(host) as c from targets group by host;'''):
