]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs.py: Simplify the regular expression used in _log_check_warn()
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Wed, 18 May 2016 22:28:14 +0000 (00:28 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 19 May 2016 21:31:33 +0000 (22:31 +0100)
In commit 0387d095 lines with "NOTE:" in them were excluded from the
log check for warnings. However, those lines were only there in the
first place since the regular expression that is used to find warning
messages explicitly included those lines...

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/rootfs.py

index 0a2753e6e8e5d6f2dcbbc84874c796623b941ad8..a92aa221037e9fa5a089d6c27f9ccca751d411d0 100644 (file)
@@ -41,11 +41,11 @@ class Rootfs(object):
         pass
 
     def _log_check_warn(self):
-        r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
+        r = re.compile('^(warn|Warn|WARNING:)')
         log_path = self.d.expand("${T}/log.do_rootfs")
         with open(log_path, 'r') as log:
             for line in log:
-                if 'log_check' in line or 'NOTE:' in line:
+                if 'log_check' in line:
                     continue
 
                 m = r.search(line)