]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs.py: tweak inner warn message catching
authorHongxu Jia <hongxu.jia@windriver.com>
Wed, 29 Oct 2014 05:54:51 +0000 (13:54 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Nov 2014 10:20:34 +0000 (10:20 +0000)
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>
meta/lib/oe/rootfs.py

index c4735f2755c56b53d3876a9a367bbb9435ff85e7..f99626ccfa0e508faf15de0d1dcdf9805b866a26 100644 (file)
@@ -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'):