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