From bdcf84820960e05397fdc52b1fed6ae4e56fc6d0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 12 Mar 2015 10:19:52 +0800 Subject: 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 --- 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 dd7aa44fed..7e8d5d15a2 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) -- cgit 1.2.3-korg