mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib/oe/rootfs: tidy up log warning reporting

Browse Source 
* bb.warn() should only be called once per warning - UIs such as Toaster
  assume that this is the case, so adjust the output accordingly. (It's
  tricky here because we have to include "log_check" on every line or
  we'll end up looping forever as the log checking code's own messages
  retrigger the log check, sigh...)
* Iterating over a file already splits by line, there's no need to do it
  manually.

(From OE-Core rev: 8dfdd329f0137cab8cab97e1d0c1181810fe5b32)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2015-06-08 11:10:37 +01:00
committed by Richard Purdie
parent 63e62599a6
commit 0090170e77
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/lib/oe/rootfs.py
View File

@@ -44,15 +44,14 @@ class Rootfs(object):
r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
for line in log.read().split('\n'):
for line in log:
if 'log_check' in line or 'NOTE:' in line:
continue
m = r.search(line)
if m:
bb.warn('log_check: There is a warn message in the logfile')
bb.warn('log_check: Matched keyword: [%s]' % m.group())
bb.warn('log_check: %s\n' % line)
bb.warn('[log_check] %s: found a warning message in the logfile (keyword \'%s\'):\n[log_check] %s'
% (self.d.getVar('PN', True), m.group(), line))
def _log_check_error(self):
r = re.compile(self.log_check_regex)
@@ -60,15 +59,15 @@ class Rootfs(object):
with open(log_path, 'r') as log:
found_error = 0
message = "\n"
for line in log.read().split('\n'):
for line in log:
if 'log_check' in line:
continue
m = r.search(line)
if m:
found_error = 1
bb.warn('log_check: There were error messages in the logfile')
bb.warn('log_check: Matched keyword: [%s]\n\n' % m.group())
bb.warn('[log_check] %s: found an error message in the logfile (keyword \'%s\'):\n[log_check] %s'
% (self.d.getVar('PN', True), m.group(), line))
if found_error >= 1 and found_error <= 5:
message += line + '\n'