Fix bug in duplicate ruleset checking

diracdeltas · diracdeltas · commit 61f0e6ba93d6 · 2013-06-13T16:27:44.000-07:00
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -165,6 +165,7 @@ def get_all_names_and_targets(ds):
     targets = set()
     for d in ds:
         for fi in os.listdir(d):
+            fi = '/'.join([d, fi])
             try:
                 tree = etree.parse(fi)
                 ruleset_name = tree.xpath("/ruleset/@name")[0]
@@ -195,9 +196,10 @@ def nomes_all(where=sys.argv[1:]):
 failure = 0
 seen_file = False
 all_names, all_targets = get_all_names_and_targets(dupdir)
+print dupdir
+print len(all_names), len(all_targets)
 
 for fi in nomes_all():
-   # print fi
     try:
         tree = etree.parse(fi)
         if fi[-4:] != ".xml":
@@ -230,7 +232,7 @@ def nomes_all(where=sys.argv[1:]):
         if target in all_targets and not any(ign.search(target) for ign in ignoredups):
             # suppress warning about duplicate targets if an --ignoredups
             # pattern matches target
-            sys.stdout.write("warning: duplicate target: %s\n" % target)
+            sys.stdout.write("warning: %s has duplicate target: %s\n" % (fi, target))
         all_targets.add(target)
 
 if not seen_file:
