From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Mar 2008 08:31:39 +0000 (-0000)
Subject: Bug #211949 - Make filter_readonly_variables() remove any variables
X-Git-Tag: v2.1.5~371
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=129d61e63c7267f786dfec3322c158686531d32f;p=portage.git

Bug #211949 - Make filter_readonly_variables() remove any variables
with names containing a hyphen since bash does not allow them.
(trunk r9402)

svn path=/main/branches/2.1.2/; revision=9403
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 61f6e18fe..9d0c42a55 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1384,8 +1384,12 @@ PORTAGE_MUTABLE_FILTERED_VARS="AA HOSTNAME"
 
 # @FUNCTION: filter_readonly_variables
 # @DESCRIPTION: [--filter-sandbox] [--allow-extra-vars]
-# Read an environment from stdin and echo to stdout while filtering readonly
-# variables.
+# Read an environment from stdin and echo to stdout while filtering variables
+# with names that are known to cause interference:
+#
+#   * some specific variables for which bash does not allow assignment
+#   * any variables with names containing a hyphen (not allowed by bash)
+#   * some specific variables that affect portage or sandbox behavior
 #
 # --filter-sandbox causes all SANDBOX_* variables to be filtered, which
 # is only desired in certain cases, such as during preprocessing or when
@@ -1414,7 +1418,7 @@ filter_readonly_variables() {
 		SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
 		SANDBOX_LOG SANDBOX_ON"
 	filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS}
-		BASH_[_[:alnum:]]* PATH"
+		BASH_[_[:alnum:]]* PATH [-_[:alnum:]]*-[-_[:alnum:]]*"
 	if hasq --filter-sandbox $* ; then
 		filtered_vars="${filtered_vars} SANDBOX_[_[:alnum:]]*"
 	else