summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-05-19 00:28:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-19 22:32:06 +0100
commita653f36814fca438db834509f99ad37e74719d45 (patch)
treef675c0a30fe4aef00bed917b15de1f936244f0f9 /meta/lib/oe/rootfs.py
parentd416a4e16ea99c5ad7644160e3670da6653d786f (diff)
downloadpoky-a653f36814fca438db834509f99ad37e74719d45.tar.gz
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... (From OE-Core rev: 865ab39f18a52ed84217df56d0e65113e2894d02) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 2 insertions, 2 deletions
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):
41 pass 41 pass
42 42
43 def _log_check_warn(self): 43 def _log_check_warn(self):
44 r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)') 44 r = re.compile('^(warn|Warn|WARNING:)')
45 log_path = self.d.expand("${T}/log.do_rootfs") 45 log_path = self.d.expand("${T}/log.do_rootfs")
46 with open(log_path, 'r') as log: 46 with open(log_path, 'r') as log:
47 for line in log: 47 for line in log:
48 if 'log_check' in line or 'NOTE:' in line: 48 if 'log_check' in line:
49 continue 49 continue
50 50
51 m = r.search(line) 51 m = r.search(line)