From c58c94824b29665f52ae67ceae3f096930c89fe5 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 27 Jan 2015 17:59:25 +0000 Subject: bitbake: toaster: update texts for the startup sequence This patch updates the prompts to the user to better explain what Toaster is doing and the information it needs from the user. Additionally, fixes a check in loadconf command. [YOCTO #6785] [YOCTO #7251] (Bitbake rev: 90ef8975f35e2da824bc1c80e41ca26d9af0b208) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index a6d2e92d17..4f25293e73 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -68,7 +68,7 @@ function webserverStartAll() python $BBBASEDIR/lib/toaster/manage.py checksettings --traceback || retval=1 fi if [ $retval -eq 0 ]; then - echo "Starting webserver" + echo "Starting webserver..." python $BBBASEDIR/lib/toaster/manage.py runserver "0.0.0.0:$WEB_PORT" ${BUILDDIR}/toaster_web_$$.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid sleep 1 if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then @@ -171,7 +171,7 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th # Start just the web server, point the web browser to the interface, and start any Django services. if [ -n "$BUILDDIR" ]; then - echo -e "Error: build/ directory detected. Toaster will not start in managed mode if a build environment is detected.\nUse a clean terminal to start Toaster." 1>&2; + echo -e "Error: It looks like you sourced oe-init-build-env. Toaster cannot start in build mode from an oe-core build environment. You can work around this problem by starting Toaster from a new terminal window." 1>&2; exit 1; fi @@ -194,7 +194,7 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th xdg-open http://127.0.0.1:$WEB_PORT/ >/dev/null 2>&1 & fi trap trap_ctrlc SIGINT - echo "Running. Stop with Ctrl-C" + echo "Toaster is now running. You can stop it with Ctrl-C" while [ $RUNNING -gt 0 ]; do python $BBBASEDIR/lib/toaster/manage.py runbuilds sleep 1 -- cgit v1.2.3-54-g00ecf