Rename override var to PORTAGE_OVERRIDE_EPREFIX.

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 482b5b1708f848e84eb9896849db66e5d3043f59..f862b30feb1550c9e2f3274c6fb9e2f9d55efc68 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -28,7 +28,7 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
        PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
        PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \
        PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
-       __PORTAGE_TEST_EPREFIX"
+       PORTAGE_OVERRIDE_EPREFIX"
 
 PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
 

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 553dfc534381d563930760716b89abb2864c9f26..a32933c4bec27201d945d20f056f12b0f215d3c5 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -149,8 +149,8 @@ MANIFEST2_IDENTIFIERS    = ("AUX", "MISC", "DIST", "EBUILD")
 EPREFIX=""
 
 # pick up EPREFIX from the environment if set
-if "__PORTAGE_TEST_EPREFIX" in os.environ:
-       EPREFIX = os.environ["__PORTAGE_TEST_EPREFIX"]
+if "PORTAGE_OVERRIDE_EPREFIX" in os.environ:
+       EPREFIX = os.environ["PORTAGE_OVERRIDE_EPREFIX"]
        if EPREFIX:
                EPREFIX = os.path.normpath(EPREFIX)
 

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 9ac37fb8514054520e577fd022172b7f35ee4e6e..3911e97730a546f5881c93dec7e66f239949e809 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -66,7 +66,7 @@ environ_whitelist += [
        "REPLACING_VERSIONS", "REPLACED_BY_VERSION",
        "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR",
        "USE_EXPAND", "USE_ORDER", "WORKDIR",
-       "XARGS", "__PORTAGE_TEST_EPREFIX",
+       "XARGS", "PORTAGE_OVERRIDE_EPREFIX",
 ]
 
 # user config variables

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 5f285c293c70f58d312fa0095577ada58bc79e14..5177229ac31b3ee43deb37809895c5c05a8acbd1 100644 (file)
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -300,7 +300,7 @@ pkg_preinst() {
                        pythonpath = PORTAGE_PYM_PATH + pythonpath
 
                env = {
-                       "__PORTAGE_TEST_EPREFIX" : eprefix,
+                       "PORTAGE_OVERRIDE_EPREFIX" : eprefix,
                        "CLEAN_DELAY" : "0",
                        "DISTDIR" : distdir,
                        "EMERGE_WARNING_DELAY" : "0",

diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index b3186d7b4781dd8b0d7eb9c1cca269f526cc1d3a..5f6d7fc7447a9eef89a159be13564ae75aa165ae 100644 (file)
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -184,7 +184,7 @@ class SimpleRepomanTestCase(TestCase):
                        pythonpath = PORTAGE_PYM_PATH + pythonpath
 
                env = {
-                       "__PORTAGE_TEST_EPREFIX" : eprefix,
+                       "PORTAGE_OVERRIDE_EPREFIX" : eprefix,
                        "DISTDIR" : distdir,
                        "GENTOO_COMMITTER_NAME" : committer_name,
                        "GENTOO_COMMITTER_EMAIL" : committer_email,