summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-10-15 09:34:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:13:23 +0100
commit320d05ea9fd353879e5e77ed97a21d76dd510210 (patch)
tree8d2dc1cc5c133aa7acc2a4edf99a12c0510c8ea2 /bitbake/bin
parent2e2e40c2c41a69483596fc35e49b87491ee80fdc (diff)
downloadpoky-320d05ea9fd353879e5e77ed97a21d76dd510210.tar.gz
bitbake: toaster: exit or return depending on the mode
When toaster script is sourced 'return' should be used as using 'exit' will cause script to exit the shell and close terminal window. If script is called 'exit' should be used. Otherwise shell will throw and error: return: can only `return' from a function or sourced script Used 'return' or 'exit' depending on the toaster mode using TOASTER_MANAGED variable. (Bitbake rev: 643c42069a2788e9f40fa1bc9845f32aed3d096c) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index cf93e9fd98..2c3432c24a 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -201,7 +201,7 @@ if [ "$TOASTER_CONF" = "" ]; then
201fi 201fi
202if [ ! -f $TOASTER_CONF ]; then 202if [ ! -f $TOASTER_CONF ]; then
203 echo "$TOASTER_CONF configuration file not found. set TOASTER_CONF to specify a path" 203 echo "$TOASTER_CONF configuration file not found. set TOASTER_CONF to specify a path"
204 exit 1; 204 [ "$TOASTER_MANAGED" = '1' ] && exit 1 || return 1
205fi 205fi
206# this defines the dir toaster will use for 206# this defines the dir toaster will use for
207# 1) clones of layers (in _toaster_clones ) 207# 1) clones of layers (in _toaster_clones )