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>
This commit is contained in:
Chen Qi
2015-03-12 10:33:34 +08:00
committed by Richard Purdie
parent c03c82a707
commit 38382e0f15

View File

@@ -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)