From d1b1b62ae8512c3324f774124b772aac2aba2c89 Mon Sep 17 00:00:00 2001 From: Kevin Yap Date: Sun, 18 Jan 2015 08:47:05 -0800 Subject: [PATCH] Ignore NOTEs when Travis runs `make tidy` Only print NOTE warnings if the 'TRAVIS' environment variable has not been set. Addresses #21322. --- src/etc/tidy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/tidy.py b/src/etc/tidy.py index 3d44c27a16e6f..373536d419ba9 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -8,7 +8,7 @@ # option. This file may not be copied, modified, or distributed # except according to those terms. -import sys, fileinput, subprocess, re +import sys, fileinput, subprocess, re, os from licenseck import * import snapshot @@ -71,7 +71,7 @@ def do_license_check(name, contents): if match: report_err("XXX is no longer necessary, use FIXME") match = re.match(r'^.*//\s*(NOTE.*)$', line) - if match: + if match and "TRAVIS" not in os.environ: m = match.group(1) if "snap" in m.lower(): report_warn(match.group(1))