diff options
-rw-r--r-- | meta/lib/oe/rootfs.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 741399adc2..479e4ccc5e 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -50,6 +50,7 @@ class Rootfs(object): | |||
50 | excludes = [re.compile(x) for x in excludes] | 50 | excludes = [re.compile(x) for x in excludes] |
51 | r = re.compile('^(warn|Warn|WARNING:)') | 51 | r = re.compile('^(warn|Warn|WARNING:)') |
52 | log_path = self.d.expand("${T}/log.do_rootfs") | 52 | log_path = self.d.expand("${T}/log.do_rootfs") |
53 | messages = [] | ||
53 | with open(log_path, 'r') as log: | 54 | with open(log_path, 'r') as log: |
54 | for line in log: | 55 | for line in log: |
55 | for ee in excludes: | 56 | for ee in excludes: |
@@ -61,8 +62,14 @@ class Rootfs(object): | |||
61 | 62 | ||
62 | m = r.search(line) | 63 | m = r.search(line) |
63 | if m: | 64 | if m: |
64 | bb.warn('[log_check] %s: found a warning message in the logfile (keyword \'%s\'):\n[log_check] %s' | 65 | messages.append('[log_check] %s' % line) |
65 | % (self.d.getVar('PN', True), m.group(), line)) | 66 | if messages: |
67 | if len(messages) == 1: | ||
68 | msg = 'a warning message' | ||
69 | else: | ||
70 | msg = '%d warning messages' % len(messages) | ||
71 | bb.warn('[log_check] %s: found %s in the logfile:\n%s' | ||
72 | % (self.d.getVar('PN', True), msg, ''.join(messages))) | ||
66 | 73 | ||
67 | def _log_check_error(self): | 74 | def _log_check_error(self): |
68 | # Ignore any lines containing log_check to avoid recursion, and ignore | 75 | # Ignore any lines containing log_check to avoid recursion, and ignore |