Merged in 'origin/master' with changes from schoen.

jpds-zz · jpds-zz · commit 4e57677fac92 · 2013-11-07T23:49:31.000Z
diff --git a/hooks/precommit b/hooks/precommit
@@ -39,11 +39,10 @@ if [ "$CHANGED_RULESETS" ]; then
             continue
         fi
 
-        # Errors will go to stderr.
-        ./utils/trivial-validate.py $FILE > /dev/null
+        ./utils/trivial-validate.py --quiet $FILE
         RESULT=$?
 
-        if [ $RESULT -eq 1 ]; then
+        if [ $RESULT -ne 0 ]; then
             echo "$(date -R): Failure encountered during ruleset validation."
             exit $RESULT
         fi
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -22,6 +22,9 @@
     default="",
     help="Duplicate directory."
     )
+parser.add_argument('--quiet', action="store_true",
+    default=false, help="Surpress debug output."
+    )
 parser.add_argument('ruleset', metavar='XML directory', type=str, nargs="*",
     default="src/chrome/content/rules",
     help='Directory of XML files to validate.')
@@ -30,6 +33,13 @@
 
 ignoredups = [re.compile(val) for val in args.ignoredups]
 dupdir = [val for val in args.dupdir]
+quiet = args.quiet
+
+def warn(s):
+    if not quiet: sys.stdout.write("warning: %s\n" % s)
+
+def fail(s):
+    sys.stdout.write("failure: %s\n" % s)
 
 def test_not_anchored(tree):
     # Rules not anchored to the beginning of a line.
@@ -59,8 +69,8 @@ def test_missing_to(tree):
     """Rule is missing a 'to' value."""
     for rule in tree.xpath("/ruleset/rule"):
 	if not rule.get("to"):
-            sys.stdout.write("warning: 'to' attribute missing in %s. " %fi)
-            sys.stdout.write("Misplaced end or misnamed element?\n")
+            warn("'to' attribute missing in %s. " %fi)
+            warn("Misplaced end or misnamed element?")
             return False
     return True
 
@@ -109,11 +119,9 @@ def test_unencrypted_to(tree):
         if to[:6] != "https:" and to[:5] != "http:":
             return False
         elif to[:5] == "http:" and downgrade:
-            sys.stdout.write("warning: downgrade rule in %s redirects " % fi)
-            sys.stdout.write("to http.\n")
+            warn("downgrade rule in %s redirects to http." % fi)
         elif to[:5] == "http:":
-            sys.stdout.write("error: rule in %s redirects to http and " % fi)
-            sys.stdout.write("downgrade attribute not specified.\n")
+            fail("non-downgrade rule in %s redirects to http." % fi)
             return False
     return True
 
@@ -218,35 +226,35 @@ def nomes_all(where=sys.argv[1:]):
         tree = etree.parse(fi)
         if fi[-4:] != ".xml":
             if tree.xpath("/ruleset"):
-                sys.stdout.write("warning: ruleset in file without .xml extension: %s\n" % fi)
+                warn("ruleset in file without .xml extension: %s" % fi)
             else:
                 continue
         seen_file = True
     except Exception as oops:
         if fi[-4:] != ".xml":
             continue
         failure = 1
-        sys.stderr.write("%s failed XML validity: %s\n" % (fi, oops))
+        fail("%s failed XML validity: %s\n" % (fi, oops))
     if failure or not tree.xpath("/ruleset"):
         continue
     if not test_ruleset_name(tree):
         failure = 1
-        sys.stderr.write("failure: unnamed ruleset: %s\n" % fi)
+        fail("unnamed ruleset: %s" % fi)
         continue
     ruleset_name = tree.xpath("/ruleset/@name")[0]
     if ruleset_name in all_names:
         failure = 1
-        sys.stdout.write("failure: duplicate ruleset name %s\n" % ruleset_name)
+        fail("duplicate ruleset name %s" % ruleset_name)
     all_names.add(ruleset_name)
     for test in tests:
         if not test(tree):
             failure = 1
-            sys.stderr.write("failure: %s failed test: %s\n" % (fi, test.__doc__))
+            fail("%s failed test: %s" % (fi, test.__doc__))
     for target in tree.xpath("/ruleset/target/@host"):
         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: %s has duplicate target: %s\n" % (fi, target))
+            warn("%s has duplicate target: %s" % (fi, target))
         all_targets.add(target)
 
 if not seen_file:
