mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

rootfs.py: Exclude lines in _log_check_warn() as well

Browse Source 
This will make _log_check_warn() exclude the same lines as
_log_check_error() does.

(From OE-Core rev: 85f64c68278f797c6f73f002f63d7f46fe80aef4)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2016-05-19 00:28:16 +02:00
committed by Richard Purdie
parent e3e8d500e2
commit 79d177822b
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,11 +41,22 @@ class Rootfs(object):
pass pass
def _log_check_warn(self): def _log_check_warn(self):
# Ignore any lines containing log_check to avoid recursion, and ignore
# lines beginning with a + since sh -x may emit code which isn't
# actually executed, but may contain error messages
excludes = [ 'log_check', r'^\+' ]
if hasattr(self, 'log_check_expected_regexes'):
excludes.extend(self.log_check_expected_regexes)
excludes = [re.compile(x) for x in excludes]
r = re.compile('^(warn|Warn|WARNING:)') r = re.compile('^(warn|Warn|WARNING:)')
log_path = self.d.expand("${T}/log.do_rootfs") log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log: with open(log_path, 'r') as log:
for line in log: for line in log:
if 'log_check' in line: for ee in excludes:
m = ee.search(line)
if m:
break
if m:
continue continue
m = r.search(line) m = r.search(line)
@@ -58,8 +69,8 @@ class Rootfs(object):
# lines beginning with a + since sh -x may emit code which isn't # lines beginning with a + since sh -x may emit code which isn't
# actually executed, but may contain error messages # actually executed, but may contain error messages
excludes = [ 'log_check', r'^\+' ] excludes = [ 'log_check', r'^\+' ]
if hasattr(self, 'log_check_expected_errors_regexes'): if hasattr(self, 'log_check_expected_regexes'):
excludes.extend(self.log_check_expected_errors_regexes) excludes.extend(self.log_check_expected_regexes)
excludes = [re.compile(x) for x in excludes] excludes = [re.compile(x) for x in excludes]
r = re.compile(self.log_check_regex) r = re.compile(self.log_check_regex)
log_path = self.d.expand("${T}/log.do_rootfs") log_path = self.d.expand("${T}/log.do_rootfs")
@@ -597,7 +608,7 @@ class DpkgRootfs(DpkgOpkgRootfs):
def __init__(self, d, manifest_dir): def __init__(self, d, manifest_dir):
super(DpkgRootfs, self).__init__(d) super(DpkgRootfs, self).__init__(d)
self.log_check_regex = '^E:' self.log_check_regex = '^E:'
self.log_check_expected_errors_regexes = \ self.log_check_expected_regexes = \
[ [
"^E: Unmet dependencies." "^E: Unmet dependencies."
] ]