From 3b0e761dce8f8c8f761b1bbb7d7d123049733b48 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 10 Jan 2012 18:42:50 +0100 Subject: [PATCH] Drop BPREFIX and EPREFIX override, bug #395633 The code is regardless non-functional and outdated. Remove remains from old cross-Prefix support. --- bin/save-ebuild-env.sh | 2 +- pym/_emerge/main.py | 2 +- pym/portage/__init__.py | 2 +- pym/portage/const.py | 13 ++----------- .../package/ebuild/_config/special_env_vars.py | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index b3f7f7b51..9b9147254 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -92,7 +92,7 @@ save_ebuild_env() { unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK # Prefix additions - unset BPREFIX DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER + unset DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER declare -p declare -fp diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 77a54df3e..87039eaa2 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -28,7 +28,7 @@ import portage.elog import portage.util import portage.locks import portage.exception -from portage.const import EPREFIX, BPREFIX, EPREFIX_LSTRIP +from portage.const import EPREFIX, EPREFIX_LSTRIP from portage.data import secpass from portage.dbapi.dep_expand import dep_expand from portage.util import normalize_path as normpath diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e7a49349e..a538f7dd2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -132,7 +132,7 @@ try: DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \ INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\ INCREMENTALS, EAPI, MISC_SH_BINARY, REPO_NAME_LOC, REPO_NAME_FILE, \ - EPREFIX, EPREFIX_LSTRIP, BPREFIX, rootuid + EPREFIX, EPREFIX_LSTRIP, rootuid except ImportError as e: sys.stderr.write("\n\n") diff --git a/pym/portage/const.py b/pym/portage/const.py index 244e3ad28..c6a9005bc 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -9,15 +9,6 @@ from portage.const_autotool import * import os -# save the original prefix -BPREFIX = EPREFIX -# pick up EPREFIX from the environment if set -if "EPREFIX" in os.environ: - if os.environ["EPREFIX"] != "": - EPREFIX = os.path.normpath(os.environ["EPREFIX"]) - else: - EPREFIX = os.environ["EPREFIX"] - # =========================================================================== # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF # =========================================================================== @@ -78,8 +69,8 @@ PORTAGE_PYM_PATH = PORTAGE_BASE_PATH + "/pym" LOCALE_DATA_PATH = PORTAGE_BASE_PATH + "/locale" # FIXME: not used EBUILD_SH_BINARY = PORTAGE_BIN_PATH + "/ebuild.sh" MISC_SH_BINARY = PORTAGE_BIN_PATH + "/misc-functions.sh" -SANDBOX_BINARY = BPREFIX + "/usr/bin/sandbox" -FAKEROOT_BINARY = BPREFIX + "/usr/bin/fakeroot" +SANDBOX_BINARY = EPREFIX + "/usr/bin/sandbox" +FAKEROOT_BINARY = EPREFIX + "/usr/bin/fakeroot" BASH_BINARY = PORTAGE_BASH MOVE_BINARY = PORTAGE_MV PRELINK_BINARY = "/usr/sbin/prelink" diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index a7c10336b..967b21d4f 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -67,7 +67,7 @@ environ_whitelist += [ "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", "USE_EXPAND", "USE_ORDER", "WORKDIR", "XARGS", "__PORTAGE_TEST_HARDLINK_LOCKS", - "BPREFIX", "DEFAULT_PATH", "EXTRA_PATH", + "DEFAULT_PATH", "EXTRA_PATH", "PORTAGE_GROUP", "PORTAGE_USER", ] -- 2.26.2