From 01079d77909ff0424f517b3994cb11b481abf1ca Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Aug 2009 21:40:46 +0000 Subject: [PATCH] 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 --- pym/portage/__init__.py | 4 ++-- 1 file 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", -- 2.26.2