From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Thu, 17 Dec 2015 16:48:52 +0000 (+0000)
Subject: toaster: remove addtoConfiguration function
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e85159905e44533882ad8290b1c9dd252ff3ea;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

toaster: remove addtoConfiguration function

This function is useless as it's called just once
and makes code less readable.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bin/toaster b/bin/toaster
index 40c3c35ef19..97ca17760f9 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -83,16 +83,6 @@ webserverStartAll()
     return $retval
 }
 
-# Helper functions to add a special configuration file
-
-addtoConfiguration()
-{
-    file=$1
-    shift
-    echo "#Created by toaster start script" > ${BUILDDIR}/conf/$file
-    for var in "$@"; do echo $var >> ${BUILDDIR}/conf/$file; done
-}
-
 INSTOPSYSTEM=0
 
 # define the stop command
@@ -339,7 +329,12 @@ fi
 
 case $CMD in
     start )
-        addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE
+        # Create configuration file
+        conf=${BUILDDIR}/conf/toaster.conf
+        echo "# Created by toaster start script" > $conf
+        echo "INHERIT+=\"toaster buildhistory\"" >> $conf
+        [ -n "$TOASTER_BRBE" ] && echo $TOASTER_BRBE >> $conf
+
         if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
             echo "Failed ${CMD}."
             return 4