From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 06:03:43 +0000 (-0000)
Subject: Bug #219286 - Whitelist INSTALL_MASK so that it works properly for binary
X-Git-Tag: v2.1.5~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf050353c36d397dd0314a6a98b51aefbcedbf64;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. (trunk r10195)

svn path=/main/branches/2.1.2/; revision=10197
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6bd33cb29..edeb93a10 100644
--- 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.py b/pym/portage.py
index 462363c91..3a12812be 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1098,6 +1098,11 @@ class config:
 		"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"
 	]