From 87374242c6517a898943bdea378108238c4c98ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 6 Jun 2012 21:32:08 +0200
Subject: 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).

---
 scripts/build/lb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/lb b/scripts/build/lb
index 7f2156b15..d33ea69dc 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
-- 
cgit v1.2.3