[SCM] live-build branch, debian, updated. debian/3.0_a48-1-17-g6e10198

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 7ce43cfc16a44cd1cf2cc8ca023bbc771c26dead
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 31 13:15:18 2012 +0200

    Allowing to inject variables through config/environment.binary into the binary environment.

diff --git a/scripts/build/lb b/scripts/build/lb
index a0e6220..ee8bad0 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -42,6 +42,13 @@ case "${1}" in
 		COMMAND="lb_${1}"
 		shift
 
+		if [ -e config/environment.binary ]
+		then
+			ENV="$(cat config/environment.binary)"
+		else
+			ENV=""
+		fi
+
 		if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
 		then
 			SCRIPT="${LB_BASE}/scripts/build/${COMMAND}"
@@ -57,6 +64,6 @@ case "${1}" in
 		fi
 
 		Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}"
-		LB=1 exec "${SCRIPT}" "${@}"
+		LB=1 ${ENV} exec "${SCRIPT}" "${@}"
 		;;
 esac

-- 
live-build