[SCM] live-build branch, debian, updated. debian/3.0_a51-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 87374242c6517a898943bdea378108238c4c98ee
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 6 21:32:08 2012 +0200

    For consistency, respecting config/environment too for both chroot and binary environments (but the content of sepcific environments for either chroot or binary still has precedence over the generic one).

diff --git a/functions/chroot.sh b/functions/chroot.sh
index 4d1d989..954b597 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -16,12 +16,15 @@ Chroot ()
 	# Executing commands in chroot
 	Echo_debug "Executing: %s" "${COMMANDS}"
 
-	if [ -e config/environment.chroot ]
-	then
-		ENV="$(grep -v '^#' config/environment.chroot)"
-	else
-		ENV=""
-	fi
+	ENV=""
+
+	for _FILE in config/environment config/environment.chroot
+	do
+		if [ -e "${_FILE}" ]
+		then
+			ENV="${ENV} $(grep -v '^#' ${_FILE})"
+		fi
+	done
 
 	if [ "${LB_USE_FAKEROOT}" != "true" ]
 	then
diff --git a/scripts/build/lb b/scripts/build/lb
index 7f2156b..d33ea69 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -42,12 +42,15 @@ case "${1}" in
 		COMMAND="lb_${1}"
 		shift
 
-		if [ -e config/environment.binary ]
-		then
-			ENV="$(grep -v '^#' config/environment.binary)"
-		else
-			ENV=""
-		fi
+		ENV=""
+
+		for _FILE in config/environment config/environment.binary
+		do
+			if [ -e "${_FILE}" ]
+			then
+				ENV="${ENV} $(grep -v '^#' ${_FILE})"
+			fi
+		done
 
 		if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
 		then

-- 
live-build