| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 05:56:52 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10195 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/isolated-functions.sh |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Bug #219286 - Whitelist INSTALL_MASK so that it works properly for binary |
| 10 |
packages. Also, filter INSTALL_MASK when saving or loading environment.bz2. |
| 11 |
This also applies to PKG_INSTALL_MASK and DOC_SYMLINKS_DIR, so add them |
| 12 |
too. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/bin/isolated-functions.sh |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/bin/isolated-functions.sh 2008-05-05 05:07:35 UTC (rev 10194) |
| 18 |
+++ main/trunk/bin/isolated-functions.sh 2008-05-05 05:56:52 UTC (rev 10195) |
| 19 |
@@ -485,6 +485,9 @@ |
| 20 |
ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \ |
| 21 |
WARN XARGS _RC_GET_KV_CACHE |
| 22 |
|
| 23 |
+ # user config variables |
| 24 |
+ unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK |
| 25 |
+ |
| 26 |
set |
| 27 |
export |
| 28 |
) |
| 29 |
|
| 30 |
Modified: main/trunk/pym/portage/__init__.py |
| 31 |
=================================================================== |
| 32 |
--- main/trunk/pym/portage/__init__.py 2008-05-05 05:07:35 UTC (rev 10194) |
| 33 |
+++ main/trunk/pym/portage/__init__.py 2008-05-05 05:56:52 UTC (rev 10195) |
| 34 |
@@ -936,7 +936,12 @@ |
| 35 |
"XARGS", |
| 36 |
] |
| 37 |
|
| 38 |
+ # user config variables |
| 39 |
_environ_whitelist += [ |
| 40 |
+ "DOC_SYMLINKS_DIR", "INSTALL_MASK", "PKG_INSTALL_MASK" |
| 41 |
+ ] |
| 42 |
+ |
| 43 |
+ _environ_whitelist += [ |
| 44 |
"A", "AA", "CATEGORY", "P", "PF", "PN", "PR", "PV", "PVR" |
| 45 |
] |
| 46 |
|
| 47 |
|
| 48 |
-- |
| 49 |
gentoo-commits@l.g.o mailing list |
Archives