aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 10:28:18 +0100
committerSteve Sakoman <steve@sakoman.com>2021-09-24 12:38:18 -1000
commit53d05a7b4a6380bd2bf8dd7bb0681e8c961bed5d (patch)
tree40581c28fa6552624650a176a00104babb29e2cc
parentf84a2f8d8bcc2fa4cd9ab6ef80ae638d0df47965 (diff)
downloadbitbake-contrib-53d05a7b4a6380bd2bf8dd7bb0681e8c961bed5d.tar.gz
build: Avoid duplicating logs in verbose mode
With "bitbake -v", for task failures you'd see the log output twice. Avoid this by using the existing "did we print info" switch. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e2c1afda4cb8023ed4ffeb5dc5bee4f0055659a8) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--lib/bb/build.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/bb/build.py b/lib/bb/build.py
index 04971636f..6e9c064e9 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -592,6 +592,10 @@ def _exec_task(fn, task, d, quieterr):
event.fire(TaskFailedSilent(task, fn, logfn, localdata), localdata)
else:
errprinted = errchk.triggered
+ # If the output is already on stdout, we've printed the information in the
+ # logs once already so don't duplicate
+ if verboseStdoutLogging:
+ errprinted = True
logger.error(str(exc))
event.fire(TaskFailed(task, fn, logfn, localdata, errprinted), localdata)
return 1