[patch] environment: Filter EROOT for all EAPIs

0001-environment-Filter-EROOT-for-all-EAPIs.patch (text/plain), 1.18 KB, created by [e-mail] on 2014-07-21 05:05:32 UTC

From 6e0d2f0b0be100c033edf3593fe327bca061f0db Mon Sep 17 00:00:00 2001
From: Michael Marineau <[e-mail]>
Date: Sun, 20 Jul 2014 20:27:43 -0700
Subject: [PATCH] environment: Filter EROOT for all EAPIs

This variable is often defined in older EAPIs with "${EROOT:=$ROOT}"
but it should never be preserved since ROOT may change. Bug #490014
---
 bin/phase-functions.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index f39a024..3a62904 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -101,10 +101,13 @@ __filter_readonly_variables() {
 	filtered_vars="$readonly_bash_vars $bash_misc_vars
 		$PORTAGE_READONLY_VARS $misc_garbage_vars"
 
-	# Don't filter/interfere with prefix variables unless they are
-	# supported by the current EAPI.
+	# Always filter EROOT to ensure it is redefined based on ROOT 
+	filtered_vars+=" EROOT"
+
+	# Don't filter/interfere with the other prefix variables unless
+	# they are supported by the current EAPI.
 	if ___eapi_has_prefix_variables; then
-		filtered_vars+=" ED EPREFIX EROOT"
+		filtered_vars+=" ED EPREFIX"
 	fi
 
 	if has --filter-sandbox $* ; then
-- 
1.8.5.5