Add some variables such as TERM to the whitelist of variables

from the calling environment that are allowed into the ebuild
environment. (trunk r8763)

svn path=/main/branches/2.1.2/; revision=8764

diff --git a/pym/portage.py b/pym/portage.py
index 152cb3e2424488e9f1151c3c6fadab49e0bef652..6033cf609fcfe712acba91ac9eb982814436de33 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -996,16 +996,27 @@ class config:
        virtuals ...etc you look in here.
        """
 
+       _environ_whitelist = []
+
        # Preserve backupenv values that are initialized in the config
        # constructor. Also, preserve XARGS since it is set by the
        # portage.data module.
-       _environ_whitelist = frozenset([
+       _environ_whitelist += [
                "FEATURES", "PORTAGE_BIN_PATH",
                "PORTAGE_CONFIGROOT", "PORTAGE_DEPCACHEDIR",
                "PORTAGE_GID", "PORTAGE_INST_GID", "PORTAGE_INST_UID",
                "PORTAGE_PYM_PATH", "PORTDIR_OVERLAY", "ROOT", "USE_ORDER",
                "XARGS",
-       ])
+       ]
+
+       # misc variables inherited from the calling environment
+       _environ_whitelist += [
+               "COLORTERM", "DISPLAY", "EDITOR", "LESS",
+               "LESSOPEN", "LOGNAME", "LS_COLORS", "PAGER",
+               "TERM", "TERMCAP", "USER",
+       ]
+
+       _environ_whitelist = frozenset(_environ_whitelist)
 
        # Filter selected variables in the config.environ() method so that
        # they don't needlessly propagate down into the ebuild environment.