diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 06:03:43 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 06:03:43 +0000 |
commit | cf050353c36d397dd0314a6a98b51aefbcedbf64 (patch) | |
tree | c009fc0392243ae009a4270a079dfaa38e503ad2 | |
parent | 9a04c91bb0d2dd2bd572a8b102faa8331ffaac53 (diff) | |
download | portage-cf050353c36d397dd0314a6a98b51aefbcedbf64.tar.gz portage-cf050353c36d397dd0314a6a98b51aefbcedbf64.tar.bz2 portage-cf050353c36d397dd0314a6a98b51aefbcedbf64.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. (trunk r10195)
svn path=/main/branches/2.1.2/; revision=10197
-rw-r--r-- | bin/isolated-functions.sh | 3 | ||||
-rw-r--r-- | pym/portage.py | 5 |
2 files changed, 8 insertions, 0 deletions
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" ] |