| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-01 08:30:13 +0000 (Sat, 01 Mar 2008) |
| 3 |
New Revision: 9402 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Bug #211949 - Make filter_readonly_variables() remove any variables |
| 9 |
with names containing a hyphen since bash does not allow them. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/ebuild.sh |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/ebuild.sh 2008-03-01 00:10:37 UTC (rev 9401) |
| 15 |
+++ main/trunk/bin/ebuild.sh 2008-03-01 08:30:13 UTC (rev 9402) |
| 16 |
@@ -1389,9 +1389,13 @@ |
| 17 |
|
| 18 |
# @FUNCTION: filter_readonly_variables |
| 19 |
# @DESCRIPTION: [--filter-sandbox] [--allow-extra-vars] |
| 20 |
-# Read an environment from stdin and echo to stdout while filtering readonly |
| 21 |
-# variables. |
| 22 |
+# Read an environment from stdin and echo to stdout while filtering variables |
| 23 |
+# with names that are known to cause interference: |
| 24 |
# |
| 25 |
+# * some specific variables for which bash does not allow assignment |
| 26 |
+# * any variables with names containing a hyphen (not allowed by bash) |
| 27 |
+# * some specific variables that affect portage or sandbox behavior |
| 28 |
+# |
| 29 |
# --filter-sandbox causes all SANDBOX_* variables to be filtered, which |
| 30 |
# is only desired in certain cases, such as during preprocessing or when |
| 31 |
# saving environment.bz2 for a binary or installed package. |
| 32 |
@@ -1419,7 +1423,7 @@ |
| 33 |
SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB |
| 34 |
SANDBOX_LOG SANDBOX_ON" |
| 35 |
filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS} |
| 36 |
- BASH_[_[:alnum:]]* PATH" |
| 37 |
+ BASH_[_[:alnum:]]* PATH [-_[:alnum:]]*-[-_[:alnum:]]*" |
| 38 |
if hasq --filter-sandbox $* ; then |
| 39 |
filtered_vars="${filtered_vars} SANDBOX_[_[:alnum:]]*" |
| 40 |
else |
| 41 |
|
| 42 |
-- |
| 43 |
gentoo-commits@l.g.o mailing list |
Archives