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 6bd33cb297b10c15738f8de4016497b3ddfe6269..edeb93a10e6879e89044af973cf9d2c2ee3da84c 100755 (executable)
--- 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 db580c47053a819c3988aeac9fae6ecce7f84a6a..c51497eef4cb2e77e5c169b4f9aa627bd3bd8e27 100644 (file)
--- 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"
        ]