[OE-core] [thud][PATCH] icecc-env: don't raise error when icecc not installed
Adam Trhon
adam.trhon at tbs-biometrics.com
Tue Feb 19 09:12:22 UTC 2019
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>
---
.../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 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
--
2.20.1
More information about the Openembedded-core
mailing list