diff options
author | Chris Laplante <chris.laplante@agilent.com> | 2020-08-19 10:21:33 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-21 14:29:25 +0100 |
commit | c67f57c09ec77568e87d3a6db0c67cc78530e99c (patch) | |
tree | 9b5f2f11c5cc586f3aec7bbb465a0d178f3be277 /bitbake | |
parent | d416bb3a68f5549d338e333944fe0134d010e750 (diff) | |
download | poky-c67f57c09ec77568e87d3a6db0c67cc78530e99c.tar.gz |
bitbake: build: make shell traps less chatty when 'bitbake -v' is useduninative-2.9
This shuts up both the DEBUG and EXIT handlers.
Also, remove an unneeded "set -o errtrace" (i.e. set -E),
since we no longer use an ERR trap.
(Bitbake rev: 89e851fa0403d1e98aeed69990101e3f84f0b283)
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/build.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 5479a53d7e..94f9cb371c 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -318,6 +318,7 @@ bb_sh_exit_handler() { | |||
318 | 318 | ||
319 | bb_bash_exit_handler() { | 319 | bb_bash_exit_handler() { |
320 | ret=$? | 320 | ret=$? |
321 | { set +x; } > /dev/null | ||
321 | trap "" DEBUG | 322 | trap "" DEBUG |
322 | if [ "$ret" != 0 ]; then | 323 | if [ "$ret" != 0 ]; then |
323 | echo "WARNING: ${BASH_SOURCE[0]}:${__BITBAKE_LAST_LINE} exit $ret from '$1'" | 324 | echo "WARNING: ${BASH_SOURCE[0]}:${__BITBAKE_LAST_LINE} exit $ret from '$1'" |
@@ -353,8 +354,8 @@ case $BASH_VERSION in | |||
353 | set -e | 354 | set -e |
354 | ;; | 355 | ;; |
355 | *) trap 'bb_bash_exit_handler "$BASH_COMMAND"' 0 | 356 | *) trap 'bb_bash_exit_handler "$BASH_COMMAND"' 0 |
356 | trap 'bb_bash_debug_handler' DEBUG | 357 | trap '{ bb_bash_debug_handler; } 2>/dev/null' DEBUG |
357 | set -eE | 358 | set -e |
358 | shopt -s extdebug | 359 | shopt -s extdebug |
359 | ;; | 360 | ;; |
360 | esac | 361 | esac |