[oe-commits] [openembedded-core] 04/55: icecc-env: don't raise error when icecc not installed

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit 84c63858be47d33e49140181d73c253886d5aec5
Author: Adam Trhon <adam.trhon at tbs-biometrics.com>
AuthorDate: Tue Feb 19 09:12:22 2019 +0000

    icecc-env: don't raise error when icecc not installed
    
    When icecc is not installed, the `which icecc` command in icecc-env.sh
    returns nonzero. This happens when environment is being sourced. When
    the terminal has `set -e`, the whole script fails and terminal is
    closed.
    
    Fix this by ignoring errors from the which command.
    
    Signed-off-by: Adam Trhon <adam.trhon at tbs-biometrics.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
index 9476007..990d2fb 100644
--- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
+++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
@@ -21,7 +21,7 @@
 #
 
 if [ -z "$ICECC_PATH" ]; then
-    ICECC_PATH=$(which icecc 2> /dev/null)
+    ICECC_PATH=$(which icecc 2> /dev/null || true)
 fi
 
 if [ -n "$ICECC_PATH" ]; then

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.