whitelist proxy vars and don't save them

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index cf258bef3aa889251c663a442c1b7a7d03f68bd7..1403c0aacbcbf3ca1764ff8c8d431107f601ca0a 100644 (file)
--- 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 52b8b3a295dbbb8176f1dd79529b68431f44bc04..31b10cd223697b597fb0ecbe6eb043b42c46da39 100644 (file)
--- 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