From 79d177822bca8049f7dc55924cf0548d22be4bcf Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 19 May 2016 00:28:16 +0200 Subject: rootfs.py: Exclude lines in _log_check_warn() as well 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 Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 63ca22f311..741399adc2 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -41,11 +41,22 @@ class Rootfs(object): pass 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:)') 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: + for ee in excludes: + m = ee.search(line) + if m: + break + if m: continue m = r.search(line) @@ -58,8 +69,8 @@ class Rootfs(object): # 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_errors_regexes'): - excludes.extend(self.log_check_expected_errors_regexes) + 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(self.log_check_regex) log_path = self.d.expand("${T}/log.do_rootfs") @@ -597,7 +608,7 @@ class DpkgRootfs(DpkgOpkgRootfs): def __init__(self, d, manifest_dir): super(DpkgRootfs, self).__init__(d) self.log_check_regex = '^E:' - self.log_check_expected_errors_regexes = \ + self.log_check_expected_regexes = \ [ "^E: Unmet dependencies." ] -- cgit 1.2.3-korg