diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-26 14:04:28 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-26 14:06:10 -0800 |
| commit | 288cc72559d8cc881f5b55e9f7a31b66035ac519 (patch) | |
| tree | 2e3c46b8c4ce3942d1b8ba114a7ee81ad4026c73 | |
| parent | c88d0f3e60db508ba91b3ac04363796dbc1aadcc (diff) | |
| download | portage-288cc72559d8cc881f5b55e9f7a31b66035ac519.tar.gz portage-288cc72559d8cc881f5b55e9f7a31b66035ac519.tar.bz2 portage-288cc72559d8cc881f5b55e9f7a31b66035ac519.zip | |
whitelist proxy vars and don't save them
| -rw-r--r-- | bin/isolated-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/special_env_vars.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index cf258bef3..1403c0aac 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -542,7 +542,7 @@ save_ebuild_env() { # misc variables inherited from the calling environment unset COLORTERM DISPLAY EDITOR LESS LESSOPEN LOGNAME LS_COLORS PAGER \ - TERM TERMCAP USER + TERM TERMCAP USER ftp_proxy http_proxy no_proxy # other variables inherited from the calling environment unset CVS_RSH ECHANGELOG_USER GPG_AGENT_INFO \ diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index 52b8b3a29..31b10cd22 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -77,6 +77,7 @@ environ_whitelist += [ "COLORTERM", "DISPLAY", "EDITOR", "LESS", "LESSOPEN", "LOGNAME", "LS_COLORS", "PAGER", "TERM", "TERMCAP", "USER", + 'ftp_proxy', 'http_proxy', 'no_proxy', ] # tempdir settings |