[oe-commits] Hongxu Jia : rootfs.py: tweak inner warn message catching

[git at git.openembedded.org]

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

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Wed Oct 29 13:54:51 2014 +0800

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 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 c4735f2..f99626c 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'):