make sure EXTRA_PATH isn't filtered by Portage (such that it disappears in ebuild...

svn path=/main/branches/prefix/; revision=15122

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 841fa5c96702958b7755ac2ffeee7f452289b545..5ae13fa1bd30de83e2b69ed8a9ca698c9b02c48f 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -576,7 +576,7 @@ save_ebuild_env() {
                        WARN XARGS _RC_GET_KV_CACHE
 
                # Prefix additions
-               unset BPREFIX DEFAULT_PATH EPREFIX PORTAGE_GROUP PORTAGE_USER
+               unset BPREFIX DEFAULT_PATH EPREFIX EXTRA_PATH PORTAGE_GROUP PORTAGE_USER
 
                # user config variables
                unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 074e16a317f89443742f7446e312cd911f274583..22b50b0a2095222089cf3b690c0483378d66680d 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1438,7 +1438,8 @@ class config(object):
                "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
                "USE_EXPAND", "USE_ORDER", "WORKDIR",
                "XARGS",
-               "BPREFIX", "DEFAULT_PATH", "PORTAGE_GROUP", "PORTAGE_USER"
+               "BPREFIX", "DEFAULT_PATH", "EXTRA_PATH",
+               "PORTAGE_GROUP", "PORTAGE_USER",
        ]
 
        # user config variables