[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-36-g80b8442

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 80b844256bd8e9b104a05db47ff6ecf28930475c
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jan 28 01:15:03 2009 +0100

    Correcting lh_configs config.cfg handling, so that it's at least working when not using config.cfg. Will have to be fixed properly later.

diff --git a/helpers/lh_config b/helpers/lh_config
index 6239345..642423f 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -712,14 +712,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
 
 if [ -x config.cfg ]
 then
-	EXTRA_ARGUMENTS="$(./config.cfg)"
+	Local_arguments "$(./config.cfg) ${@}"
 elif [ -r config.cfg ]
 then
-	EXTRA_ARGUMENTS="$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g')"
+	Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}"
+else
+	Local_arguments "${@}"
 fi
 
-Local_arguments "${EXTRA_ARGUMENTS} ${@}"
-
 if [ -n "${_CONFFILE}" ]
 then
 	Read_conffiles "${_CONFFILE}"

-- 
Debian Live build scripts