diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-11 21:40:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-11 21:40:46 +0000 |
| commit | 01079d77909ff0424f517b3994cb11b481abf1ca (patch) | |
| tree | e1037c8b271ed8f7ce647280ddd6000e2ca5a3aa /pym | |
| parent | aa3c8d52c4686ff9bb6a45f324569135c2f7dad6 (diff) | |
| download | portage-01079d77909ff0424f517b3994cb11b481abf1ca.tar.gz portage-01079d77909ff0424f517b3994cb11b481abf1ca.tar.bz2 portage-01079d77909ff0424f517b3994cb11b481abf1ca.zip | |
Filter ACCEPT_PROPERTIES from the ebuild environment, since unlike
ACCEPT_LICENSE (used by check_license in eutils.eclass), ACCEPT_PROPERTIES
should never be needed in the ebuild environment.
svn path=/main/trunk/; revision=14000
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 9a40f7ad7..c15366d93 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1140,7 +1140,7 @@ class config(object): # environment in order to prevent sandbox from sourcing /etc/profile # in it's bashrc (causing major leakage). _environ_whitelist += [ - "ACCEPT_LICENSE", "ACCEPT_PROPERTIES", "BASH_ENV", "BUILD_PREFIX", "D", + "ACCEPT_LICENSE", "BASH_ENV", "BUILD_PREFIX", "D", "DISTDIR", "DOC_SYMLINKS_DIR", "EBUILD", "EBUILD_EXIT_STATUS_FILE", "EBUILD_FORCE_TEST", "EBUILD_PHASE", "ECLASSDIR", "ECLASS_DEPTH", "EMERGE_FROM", @@ -1211,7 +1211,7 @@ class config(object): # portage config variables and variables set directly by portage _environ_filter += [ - "ACCEPT_KEYWORDS", "AUTOCLEAN", + "ACCEPT_KEYWORDS", "ACCEPT_PROPERTIES", "AUTOCLEAN", "CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS", "EMERGE_LOG_DIR", |