diff options
| author | Adam Trhon <adam.trhon@tbs-biometrics.com> | 2019-02-12 12:14:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-16 08:19:34 +0000 |
| commit | 04e8023f7e964e81dda4fa2fbad4d6019c4defb4 (patch) | |
| tree | 0b645ab55611cd3df2060eff623115ef9d7b96cf | |
| parent | a08083aee5a9a7fd016be9cfbf624975a7dca13d (diff) | |
| download | poky-04e8023f7e964e81dda4fa2fbad4d6019c4defb4.tar.gz | |
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.
(From OE-Core rev: 27a8c14039970105238b66b9f3025435cb7e8a58)
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.sh | 2 |
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 @@ | |||
| 21 | # | 21 | # |
| 22 | 22 | ||
| 23 | if [ -z "$ICECC_PATH" ]; then | 23 | if [ -z "$ICECC_PATH" ]; then |
| 24 | ICECC_PATH=$(which icecc 2> /dev/null) | 24 | ICECC_PATH=$(which icecc 2> /dev/null || true) |
| 25 | fi | 25 | fi |
| 26 | 26 | ||
| 27 | if [ -n "$ICECC_PATH" ]; then | 27 | if [ -n "$ICECC_PATH" ]; then |