aboutsummaryrefslogtreecommitdiffstats
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:38:37 +0000
commit3e9e2ce380a73b50cbfc1995e361cfe879de6a8a (patch)
tree791cec5ce3d7d0e55f5e9e7d2b7129c7fea5d678
parent892c8d80e7cf36b3a45dca248969d49ce78c0cbf (diff)
downloadopenembedded-core-contrib-3e9e2ce380a73b50cbfc1995e361cfe879de6a8a.tar.gz
openembedded-core-contrib-3e9e2ce380a73b50cbfc1995e361cfe879de6a8a.tar.bz2
openembedded-core-contrib-3e9e2ce380a73b50cbfc1995e361cfe879de6a8a.zip
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 dd7aa44fed5..7e8d5d15a27 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -359,7 +359,7 @@ class RpmRootfs(Rootfs):
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
for line in log.read().split('\n'):
- if 'log_check' or 'NOTE:' in line:
+ if 'log_check' in line or 'NOTE:' in line:
continue
m = r.search(line)