[SCM] debian-live/live-helper branch, master, updated. 1.0_a41-1-9-g07a3c54

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8f2ad4fc97a832a5c9791432057445eaef005806
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 7 12:04:35 2008 +0200

    Allowing multiple arguments for Read_conffile();.

diff --git a/functions/conffile.sh b/functions/conffile.sh
index 17121b8..4c233a0 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -15,22 +15,25 @@ Read_conffile ()
 	then
 		FILES="${LH_CONFIG}"
 	else
-		FILES="${1} ${1}.${LH_ARCHITECTURE} ${1}.${DISTRIBUTION}"
-		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
-		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
-		FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
+		for FILE in ${@}
+		do
+			FILES="${FILE} ${FILE}.${LH_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
+			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
+		done
 	fi
 
-	for FILE in ${FILES}
+	for CONFFILE in ${FILES}
 	do
-		if [ -f "${FILE}" ]
+		if [ -f "${CONFFILE}" ]
 		then
-			if [ -r "${FILE}" ]
+			if [ -r "${CONFFILE}" ]
 			then
-				Echo_debug "Reading configuration file ${FILE}"
-				. "${FILE}"
+				Echo_debug "Reading configuration file ${CONFFILE}"
+				. "${CONFFILE}"
 			else
-				Echo_warning "Failed to read configuration file ${FILE}"
+				Echo_warning "Failed to read configuration file ${CONFFILE}"
 			fi
 		fi
 	done

-- 
debian-live/live-helper