[oe-commits] Chen Qi : rootfs.py: fix logic error so that warnings are checked

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 3e9e2ce380a73b50cbfc1995e361cfe879de6a8a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3e9e2ce380a73b50cbfc1995e361cfe879de6a8a

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Thu Mar 12 10:33:34 2015 +0800

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 at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/lib/oe/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index dd7aa44..7e8d5d1 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)