[oe-commits] Richard Purdie : oe-buildenv-internal: Fix exit verses return

git at git.openembedded.org git at git.openembedded.org
Mon Jun 17 09:34:24 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: bde54b4c4f8de696666a8c79c8cb6cf224c246e1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bde54b4c4f8de696666a8c79c8cb6cf224c246e1

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Jun 17 10:40:15 2013 +0100

oe-buildenv-internal: Fix exit verses return

This script is sourced so we should return, not exit.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/oe-buildenv-internal |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 40d95b7..62a410e 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -37,7 +37,7 @@ py_v3_check=`/usr/bin/env python --version 2>&1 | grep "Python 3"`
 if [ "$py_v3_check" != "" ]; then
 	echo "Bitbake is not compatible with python v3"
 	echo "Please set up python v2 as your default python interpreter"
-	exit 1
+	return 1
 fi
 
 # Similarly, we now have code that doesn't parse correctly with older
@@ -46,7 +46,7 @@ fi
 py_v26_check=`python -c 'import sys; print sys.version_info >= (2,7,3)'`
 if [ "$py_v26_check" != "True" ]; then
 	echo "BitBake requires Python 2.7.3 or later"
-	exit 1
+	return 1
 fi
 
 if [ "x$BDIR" = "x" ]; then



More information about the Openembedded-commits mailing list