From 8d524638e4e664a684d781181a09eee3de12319c Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Dec 2011 11:39:32 -0800
Subject: filter_readonly_variables: refactor binpkg logic

---
 bin/phase-functions.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 7407aba93..2167853dc 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -126,14 +126,15 @@ filter_readonly_variables() {
 			LC_CTYPE LC_MESSAGES LC_MONETARY
 			LC_NUMERIC LC_PAPER LC_TIME"
 	fi
-	if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then
-		filtered_vars="
-			${filtered_vars}
-			${PORTAGE_SAVED_READONLY_VARS}
-			${PORTAGE_MUTABLE_FILTERED_VARS}
-		"
-	elif ! has --allow-extra-vars $* ; then
-		filtered_vars+=" ${binpkg_untrusted_vars}"
+	if ! has --allow-extra-vars $* ; then
+		if [ "${EMERGE_FROM}" = binary ] ; then
+			# preserve additional variables from build time,
+			# while excluding untrusted variables
+			filtered_vars+=" ${binpkg_untrusted_vars}"
+		else
+			filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}"
+			filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}"
+		fi
 	fi
 
 	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
-- 
cgit v1.2.3-1-g7c22