summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-05 05:56:52 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-05 05:56:52 +0000
commit1729717d453726399ac0f9f7db4d6a9f86dc46bf (patch)
tree58f7c704d03bf9e07740b9fb8e8c4ae8edbc3e9f
parent2c51c32b7f4cc06ffa1b3c2b5832948eb9a127ae (diff)
downloadportage-1729717d453726399ac0f9f7db4d6a9f86dc46bf.tar.gz
portage-1729717d453726399ac0f9f7db4d6a9f86dc46bf.tar.bz2
portage-1729717d453726399ac0f9f7db4d6a9f86dc46bf.zip
Bug #219286 - Whitelist INSTALL_MASK so that it works properly for binary
packages. Also, filter INSTALL_MASK when saving or loading environment.bz2. This also applies to PKG_INSTALL_MASK and DOC_SYMLINKS_DIR, so add them too. svn path=/main/trunk/; revision=10195
-rwxr-xr-xbin/isolated-functions.sh3
-rw-r--r--pym/portage/__init__.py5
2 files changed, 8 insertions, 0 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6bd33cb29..edeb93a10 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -485,6 +485,9 @@ save_ebuild_env() {
ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \
WARN XARGS _RC_GET_KV_CACHE
+ # user config variables
+ unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
+
set
export
)
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index db580c470..c51497eef 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -936,6 +936,11 @@ class config(object):
"XARGS",
]
+ # user config variables
+ _environ_whitelist += [
+ "DOC_SYMLINKS_DIR", "INSTALL_MASK", "PKG_INSTALL_MASK"
+ ]
+
_environ_whitelist += [
"A", "AA", "CATEGORY", "P", "PF", "PN", "PR", "PV", "PVR"
]