From dd74cb6b4717a9afa5ba392c604d4bd7815014a7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 28 Jan 2009 01:15:03 +0100
Subject: 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.

---
 helpers/lh_config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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}"
-- 
cgit v1.0