aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-10-29 13:54:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:20:34 +0000
commit4ceb3b5f928af7f631294c83b83e3a3c89cbf890 (patch)
tree0572362381c9aade1999a39304d14b826d8856c0
parentbeb2e989e24e671fecd37805876dfb2375ee0df6 (diff)
downloadopenembedded-core-contrib-4ceb3b5f928af7f631294c83b83e3a3c89cbf890.tar.gz
openembedded-core-contrib-4ceb3b5f928af7f631294c83b83e3a3c89cbf890.tar.bz2
openembedded-core-contrib-4ceb3b5f928af7f631294c83b83e3a3c89cbf890.zip
rootfs.py: tweak inner warn message catching
The fix filters out irrelevant messages, and makes the catching more accurate, the inner warn message in do_rootfs usually comes from the output of complementary install, and pattern the format to catch it. Here is the example of irrelevant messages: ... |WARNING: log_check: There is a warn message in the logfile |WARNING: log_check: Matched keyword: [warn] |WARNING: log_check: `tmp/deploy/rpm/core2_64/pam-plugin-warn -1.1.6-r5.0.core2_64.rpm' -> `tmp/work/intel_x86_64-wrs-linux/ wrlinux-image-installer/1.0-r0/rootfs/Packages.intel/./core2_64/ pam-plugin-warn-1.1.6-r5.0.core2_64.rpm' ... Signed-off-by: Hongxu Jia <hongxu.jia@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 c4735f2755..f99626ccfa 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -348,7 +348,7 @@ class RpmRootfs(Rootfs):
pass
def _log_check_warn(self):
- r = re.compile('(warn|Warn)')
+ r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn)')
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
for line in log.read().split('\n'):