summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Neri <ricardo.neri-calderon@linux.intel.com>2015-02-06 12:59:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-14 08:40:57 +0000
commit4870290ee5f560ece372d32777056f419f86654b (patch)
treebcdefb2eef039715e351980e49adcd40bc434746
parent2c2b003de5aba4f5b5fa4a140bae9164eeec022d (diff)
downloadpoky-4870290ee5f560ece372d32777056f419f86654b.tar.gz
rootfs.py: ignore "NOTE:" when catching warnings
The script looks for any warn|Warn pattern in the log. However, it may happen that the warn|Warn pattern appears as part of the name of the objects described in the NOTE lines of the log. Thus, to avoid false positives, ignore the line if it contains the word "NOTE:" (From OE-Core rev: 0387d0957909a9977efd8b2008e4d1c6d81ceb2a) Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f42a2ae7b3..dd7aa44fed 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -359,7 +359,7 @@ class RpmRootfs(Rootfs):
359 log_path = self.d.expand("${T}/log.do_rootfs") 359 log_path = self.d.expand("${T}/log.do_rootfs")
360 with open(log_path, 'r') as log: 360 with open(log_path, 'r') as log:
361 for line in log.read().split('\n'): 361 for line in log.read().split('\n'):
362 if 'log_check' in line: 362 if 'log_check' or 'NOTE:' in line:
363 continue 363 continue
364 364
365 m = r.search(line) 365 m = r.search(line)