From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 05:56:52 +0000 (-0000)
Subject: Bug #219286 - Whitelist INSTALL_MASK so that it works properly for binary
X-Git-Tag: v2.2_pre6~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1729717d453726399ac0f9f7db4d6a9f86dc46bf;p=portage.git

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
---

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"
 	]