]> code.ossystems Code Review - openembedded-core.git/commitdiff
Revert "rootfs.py: add more info to the warning message"
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Wed, 18 May 2016 22:28:12 +0000 (00:28 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 19 May 2016 21:31:33 +0000 (22:31 +0100)
The reverted commit added a warning with the log line that triggered
the log check for error messages before the warning that states that
an error has been found in the log. However, the error line is output
by the call to bb.fatal() that follows immediately after the original
warning, which makes it redundant. Additionaly, having two warnings
contradicts the intent of commit 8dfdd329 where the log warnings were
tidied up.

This reverts commit f9cf31525fc885e1a0f65bd55654631257f87078.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/rootfs.py

index 95fd3ab7f1fba8b0c1f018e1bcddad0433f83b8d..f6fb06cc08d9ba4a5d9d2f65a993221e3b630446 100644 (file)
@@ -75,7 +75,6 @@ class Rootfs(object):
                 m = r.search(line)
                 if m:
                     found_error = 1
-                    bb.warn('[log_check] In line: [%s]' % line)
                     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))