summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 10:28:18 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2022-03-03 08:22:20 +0100
commit3b61472b07896c7afcd21ff2e1dae9219aa4dad8 (patch)
tree4dff28183cce79046b6e9d3c4d04ba02931dce14
parentf0974df89e6f7370b44d062c1c931306e611383f (diff)
downloadbitbake-contrib-3b61472b07896c7afcd21ff2e1dae9219aa4dad8.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>
-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 974d2ff06..3f04f9f3f 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -699,6 +699,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