diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:32:44 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:32:44 -0800 |
| commit | ce1e80852ace9779a1bb70d16465b7fd73e705b4 (patch) | |
| tree | 51ccff0552d6d21e319caf4863ab3d08ce2dccca | |
| parent | 1a171bdd8936fb3b5291dc143e141dfebcee8d9f (diff) | |
| download | portage-ce1e80852ace9779a1bb70d16465b7fd73e705b4.tar.gz portage-ce1e80852ace9779a1bb70d16465b7fd73e705b4.tar.bz2 portage-ce1e80852ace9779a1bb70d16465b7fd73e705b4.zip | |
Rename override var to PORTAGE_OVERRIDE_EPREFIX.
| -rw-r--r-- | bin/phase-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/const.py | 4 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/special_env_vars.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/emerge/test_simple.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/repoman/test_simple.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 482b5b170..f862b30fe 100644 --- 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 553dfc534..a32933c4b 100644 --- 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 9ac37fb85..3911e9773 100644 --- 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 5f285c293..5177229ac 100644 --- 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 b3186d7b4..5f6d7fc74 100644 --- 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, |