aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Trhon <adam.trhon@tbs-biometrics.com>2019-02-12 12:14:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-16 08:19:29 +0000
commit27a8c14039970105238b66b9f3025435cb7e8a58 (patch)
tree3adccb0ddc1cb85a1813583680033fddfa131bab
parentea98fd17ae38efca13ce97c2e0eaacb8cfde597d (diff)
downloadopenembedded-core-master.tar.gz
openembedded-core-master.tar.bz2
openembedded-core-master.zip
icecc-env: don't raise error when icecc not installedHEADmaster
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@tbs-biometrics.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh2
1 files changed, 1 insertions, 1 deletions
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 81b3018bb6..0dccc41c8a 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