aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-05-19 00:28:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-19 22:31:33 +0100
commit865ab39f18a52ed84217df56d0e65113e2894d02 (patch)
treec435aa15a710857d3407623ab20a4561300cbf41
parent1eb0a46502fca4b2ee30ccd2508f4e21a40c25ca (diff)
downloadopenembedded-core-contrib-865ab39f18a52ed84217df56d0e65113e2894d02.tar.gz
rootfs.py: Simplify the regular expression used in _log_check_warn()
In commit 0387d095 lines with "NOTE:" in them were excluded from the log check for warnings. However, those lines were only there in the first place since the regular expression that is used to find warning messages explicitly included those lines... Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0a2753e6e8..a92aa22103 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -41,11 +41,11 @@ class Rootfs(object):
pass
def _log_check_warn(self):
- r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
+ r = re.compile('^(warn|Warn|WARNING:)')
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
for line in log:
- if 'log_check' in line or 'NOTE:' in line:
+ if 'log_check' in line:
continue
m = r.search(line)