From 40764c7039f1ee161916d4fbf7dfe15fb964030e Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 17 Mar 2016 10:56:28 +0100 Subject: oe-init-build-env*: Make them actually return failures If either of the internal scripts (oe-buildenv-internal and oe-setup-builddir) failed, oe-init-build-env (and oe-init-build-env-memres) would still return success. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- oe-init-build-env-memres | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'oe-init-build-env-memres') diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres index 9d393f5812..9e1425ea83 100755 --- a/oe-init-build-env-memres +++ b/oe-init-build-env-memres @@ -56,11 +56,15 @@ fi unset THIS_SCRIPT export OEROOT -. $OEROOT/scripts/oe-buildenv-internal && \ - TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ - [ -n "$BUILDDIR" ] && cd "$BUILDDIR" +. $OEROOT/scripts/oe-buildenv-internal && + TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { + unset OEROOT + return 1 +} unset OEROOT +[ -z "$BUILDDIR" ] || cd "$BUILDDIR" + res=1 if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then BBSERVER=$(cat bitbake.lock) bitbake --status-only -- cgit 1.2.3-korg