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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9a40f7ad7a734ee77f77bc463079cf7b9064b9de..c15366d934ac6501528bac0b14b74eaf23a44ac0 100644 (file)
--- 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",