From ba4a61e69cd4035b5cdaa6cdf6be538af5ddaabb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 Sep 2021 10:13:06 +0100 Subject: bitbake: process: Don't include logs in error message if piping them If the caller is piping the logs, they likely don't want them in the error exception as well. This removes duplicate output from the build output allowing the UI level controls on whether to show logs to work correctly. (Bitbake rev: fc58ad84a9deb2620ad90611684dad65dafedb11) Signed-off-by: Richard Purdie --- bitbake/lib/bb/process.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/process.py b/bitbake/lib/bb/process.py index 7c3995cce5..d5a1775fce 100644 --- a/bitbake/lib/bb/process.py +++ b/bitbake/lib/bb/process.py @@ -181,5 +181,8 @@ def run(cmd, input=None, log=None, extrafiles=None, **options): stderr = stderr.decode("utf-8") if pipe.returncode != 0: + if log: + # Don't duplicate the output in the exception if logging it + raise ExecutionError(cmd, pipe.returncode, None, None) raise ExecutionError(cmd, pipe.returncode, stdout, stderr) return stdout, stderr -- cgit v1.2.3-54-g00ecf