From: Andre McCurdy <armccurdy@gmail.com>
Date: Thu, 28 Jan 2016 00:43:16 +0000 (-0800)
Subject: build.py: minor shell_trap_code() formatting tweaks
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e12c8f8441a7c6a03e603c5789d6037945704c1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

build.py: minor shell_trap_code() formatting tweaks

Fix quoting of $BASH_COMMAND and avoid wrapping at 80 columns (the
script which follows is likely to contain some very long lines, so
line wrapping in bb_exit_handler() looks somewhat out of place).

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/build.py b/lib/bb/build.py
index 88522099389..4a48a61fab6 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -277,9 +277,8 @@ bb_exit_handler() {
     case $ret in
     0)  ;;
     *)  case $BASH_VERSION in
-        "")   echo "WARNING: exit code $ret from a shell command.";;
-        *)    echo "WARNING: ${BASH_SOURCE[0]}:${BASH_LINENO[0]} exit $ret from
-  \"$BASH_COMMAND\"";;
+        "") echo "WARNING: exit code $ret from a shell command.";;
+        *)  echo "WARNING: ${BASH_SOURCE[0]}:${BASH_LINENO[0]} exit $ret from '$BASH_COMMAND'";;
         esac
         exit $ret
     esac