diff options
| -rwxr-xr-x | bin/isolated-functions.sh | 4 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 30d575266..446df8309 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -386,8 +386,8 @@ save_ebuild_env() { ( # misc variables set by bash - unset BASH HOSTTYPE IFS MACHTYPE OLDPWD \ - OPTERR OPTIND OSTYPE PS4 PWD SHELL + unset BASH HOSTNAME HOSTTYPE IFS MACHTYPE OLDPWD \ + OPTERR OPTIND OSTYPE PS4 PWD SHELL SHLVL # misc variables inherited from the calling environment unset COLORTERM DISPLAY EDITOR LESS LESSOPEN LOGNAME LS_COLORS PAGER \ diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a93ead837..28d5eeed5 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -860,7 +860,19 @@ class config(object): # Filter selected variables in the config.environ() method so that # they don't needlessly propagate down into the ebuild environment. - _environ_filter = frozenset(["ACCEPT_KEYWORDS", "AUTOCLEAN", + _environ_filter = [] + + # misc variables inherited from the calling environment + _environ_filter += [ + "CVS_RSH", "ECHANGELOG_USER", + "GPG_AGENT_INFO", "INFOPATH", "MANPATH", + "SSH_AGENT_PID", "SSH_AUTH_SOCK", + "STY", "WINDOW", "XAUTHORITY", + ] + + # portage config variables and variables set directly by portage + _environ_filter += [ + "ACCEPT_KEYWORDS", "AUTOCLEAN", "CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "EMERGE_DEFAULT_OPTS", "EMERGE_WARNING_DELAY", "FETCHCOMMAND", "FETCHCOMMAND_FTP", @@ -873,7 +885,10 @@ class config(object): "PORTAGE_GPG_KEY", "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", "PORTAGE_RSYNC_RETRIES", "PORT_LOGDIR", "QUICKPKG_DEFAULT_OPTS", "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP", - "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER"]) + "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER", + ] + + _environ_filter = frozenset(_environ_filter) def __init__(self, clone=None, mycpv=None, config_profile_path=None, config_incrementals=None, config_root=None, target_root=None, |