From: Peter Kjellerstedt Date: Wed, 18 May 2016 22:28:14 +0000 (+0200) Subject: rootfs.py: Simplify the regular expression used in _log_check_warn() X-Git-Tag: uninative-1.3~1055 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=865ab39f18a52ed84217df56d0e65113e2894d02;p=openembedded-core.git rootfs.py: Simplify the regular expression used in _log_check_warn() 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 Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 0a2753e6e8..a92aa22103 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -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)