[gentoo-commits] portage r9403 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-01 08:31:39 +0000 (Sat, 01 Mar 2008)
New Revision: 9403

Modified:
   main/branches/2.1.2/bin/ebuild.sh
Log:
Bug #211949 - Make filter_readonly_variables() remove any variables
with names containing a hyphen since bash does not allow them.
(trunk r9402)


Modified: main/branches/2.1.2/bin/ebuild.sh
===================================================================
--- main/branches/2.1.2/bin/ebuild.sh	2008-03-01 08:30:13 UTC (rev 9402)
+++ main/branches/2.1.2/bin/ebuild.sh	2008-03-01 08:31:39 UTC (rev 9403)
@@ -1384,9 +1384,13 @@
 
 # @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
 # saving environment.bz2 for a binary or installed package.
@@ -1414,7 +1418,7 @@
 		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

-- 
gentoo-commits@l.g.o mailing list