summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-03-12 10:33:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:41:57 +0000
commit38382e0f15bbba4b2e4188f41398a00ad70cda12 (patch)
treebc6b6602eed239801150ff807f19fae7e40b7e90 /meta/lib
parentc03c82a7073d9141afca99e7a9a71dab4221b68a (diff)
downloadpoky-38382e0f15bbba4b2e4188f41398a00ad70cda12.tar.gz
rootfs.py: fix logic error so that warnings are checked
The following commit caused log checking for warnings not working for RPM rootfs. rootfs.py: ignore "NOTE:" when catching warnings The problem is that checking for warnings is always skipped because the following statement is always true. if 'log_check' or 'NOTE:' in line: This patch fixes the above problem so that warning checking in RPM rootfs can work again. (From OE-Core rev: 3e9e2ce380a73b50cbfc1995e361cfe879de6a8a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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 dd7aa44fed..7e8d5d15a2 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' or 'NOTE:' in line: 362 if 'log_check' in line or 'NOTE:' in line:
363 continue 363 continue
364 364
365 m = r.search(line) 365 m = r.search(line)