diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-10 10:28:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-02 09:55:51 +0100 |
commit | 4de265915c0a82408778a66179df1ca95568d238 (patch) | |
tree | edccc7da8a8b8bd2e998eb5eb373d2cf77617bd5 /bitbake | |
parent | 0e8c6cad0800f6c3f5ab1743a77e014be3c7e297 (diff) | |
download | poky-4de265915c0a82408778a66179df1ca95568d238.tar.gz |
bitbake: 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.
(Bitbake rev: 53d05a7b4a6380bd2bf8dd7bb0681e8c961bed5d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2c1afda4cb8023ed4ffeb5dc5bee4f0055659a8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/build.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 04971636fe..6e9c064e9d 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -592,6 +592,10 @@ def _exec_task(fn, task, d, quieterr): | |||
592 | event.fire(TaskFailedSilent(task, fn, logfn, localdata), localdata) | 592 | event.fire(TaskFailedSilent(task, fn, logfn, localdata), localdata) |
593 | else: | 593 | else: |
594 | errprinted = errchk.triggered | 594 | errprinted = errchk.triggered |
595 | # If the output is already on stdout, we've printed the information in the | ||
596 | # logs once already so don't duplicate | ||
597 | if verboseStdoutLogging: | ||
598 | errprinted = True | ||
595 | logger.error(str(exc)) | 599 | logger.error(str(exc)) |
596 | event.fire(TaskFailed(task, fn, logfn, localdata, errprinted), localdata) | 600 | event.fire(TaskFailed(task, fn, logfn, localdata, errprinted), localdata) |
597 | return 1 | 601 | return 1 |