From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Fri, 6 Feb 2015 20:59:57 +0000 (-0800)
Subject: rootfs.py: ignore "NOTE:" when catching warnings
X-Git-Tag: 2015-4~470
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0387d0957909a9977efd8b2008e4d1c6d81ceb2a;p=openembedded-core.git

rootfs.py: ignore "NOTE:" when catching warnings

The script looks for any warn|Warn pattern in the log. However,
it may happen that the warn|Warn pattern appears as part of the name
of the objects described in the NOTE lines of the log. Thus, to avoid
false positives, ignore the line if it contains the word "NOTE:"

Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f42a2ae7b3..dd7aa44fed 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' in line:
+                if 'log_check' or 'NOTE:' in line:
                     continue
 
                 m = r.search(line)