From: Juro Bystricky <juro.bystricky@intel.com>
Date: Wed, 16 Dec 2015 21:24:07 +0000 (-0800)
Subject: oe-buildenv-internal: fix return code
X-Git-Tag: 2016-4~1871
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9ae79973cfdabd1b4dacddce32735c65fe3544e4;p=openembedded-core.git

oe-buildenv-internal: fix return code

The script oe-buildenv-internal is called from oe-init-build-env.
Make sure oe-init-buildenv does not return an error if BB_ENV_EXTRAWHITE is
already set, otherwise this will cause oe-init-build-env to fail.

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 51e449ac3b..457763b794 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -110,4 +110,6 @@ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
 SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
 
 echo "$BB_ENV_EXTRAWHITE" | grep -q "${BB_ENV_EXTRAWHITE_OE}"
-[ $? != 0 ] && export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE"
+if [ $? != 0 ]; then
+     export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE"
+fi