From c67f57c09ec77568e87d3a6db0c67cc78530e99c Mon Sep 17 00:00:00 2001
From: Chris Laplante <chris.laplante@agilent.com>
Date: Wed, 19 Aug 2020 10:21:33 -0400
Subject: bitbake: build: make shell traps less chatty when 'bitbake -v' is
 used

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>
---
 bitbake/lib/bb/build.py | 5 +++--
 1 file 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() {
 
 bb_bash_exit_handler() {
     ret=$?
+    { set +x; } > /dev/null
     trap "" DEBUG
     if [ "$ret" != 0 ]; then
         echo "WARNING: ${BASH_SOURCE[0]}:${__BITBAKE_LAST_LINE} exit $ret from '$1'"
@@ -353,8 +354,8 @@ case $BASH_VERSION in
     set -e
     ;;
 *)  trap 'bb_bash_exit_handler "$BASH_COMMAND"' 0
-    trap 'bb_bash_debug_handler' DEBUG
-    set -eE
+    trap '{ bb_bash_debug_handler; } 2>/dev/null' DEBUG
+    set -e
     shopt -s extdebug
     ;;
 esac
-- 
cgit v1.2.3-54-g00ecf