| 1 |
commit: 3b0e761dce8f8c8f761b1bbb7d7d123049733b48 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 17:42:50 2012 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 17:42:50 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3b0e761d |
| 7 |
|
| 8 |
Drop BPREFIX and EPREFIX override, bug #395633 |
| 9 |
|
| 10 |
The code is regardless non-functional and outdated. Remove remains from |
| 11 |
old cross-Prefix support. |
| 12 |
|
| 13 |
--- |
| 14 |
bin/save-ebuild-env.sh | 2 +- |
| 15 |
pym/_emerge/main.py | 2 +- |
| 16 |
pym/portage/__init__.py | 2 +- |
| 17 |
pym/portage/const.py | 13 ++----------- |
| 18 |
.../package/ebuild/_config/special_env_vars.py | 2 +- |
| 19 |
5 files changed, 6 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh |
| 22 |
index b3f7f7b..9b91472 100644 |
| 23 |
--- a/bin/save-ebuild-env.sh |
| 24 |
+++ b/bin/save-ebuild-env.sh |
| 25 |
@@ -92,7 +92,7 @@ save_ebuild_env() { |
| 26 |
unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK |
| 27 |
|
| 28 |
# Prefix additions |
| 29 |
- unset BPREFIX DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER |
| 30 |
+ unset DEFAULT_PATH EXTRA_PATH PORTAGE_GROUP PORTAGE_USER |
| 31 |
|
| 32 |
declare -p |
| 33 |
declare -fp |
| 34 |
|
| 35 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 36 |
index 77a54df..87039ea 100644 |
| 37 |
--- a/pym/_emerge/main.py |
| 38 |
+++ b/pym/_emerge/main.py |
| 39 |
@@ -28,7 +28,7 @@ import portage.elog |
| 40 |
import portage.util |
| 41 |
import portage.locks |
| 42 |
import portage.exception |
| 43 |
-from portage.const import EPREFIX, BPREFIX, EPREFIX_LSTRIP |
| 44 |
+from portage.const import EPREFIX, EPREFIX_LSTRIP |
| 45 |
from portage.data import secpass |
| 46 |
from portage.dbapi.dep_expand import dep_expand |
| 47 |
from portage.util import normalize_path as normpath |
| 48 |
|
| 49 |
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py |
| 50 |
index e7a4934..a538f7d 100644 |
| 51 |
--- a/pym/portage/__init__.py |
| 52 |
+++ b/pym/portage/__init__.py |
| 53 |
@@ -132,7 +132,7 @@ try: |
| 54 |
DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \ |
| 55 |
INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\ |
| 56 |
INCREMENTALS, EAPI, MISC_SH_BINARY, REPO_NAME_LOC, REPO_NAME_FILE, \ |
| 57 |
- EPREFIX, EPREFIX_LSTRIP, BPREFIX, rootuid |
| 58 |
+ EPREFIX, EPREFIX_LSTRIP, rootuid |
| 59 |
|
| 60 |
except ImportError as e: |
| 61 |
sys.stderr.write("\n\n") |
| 62 |
|
| 63 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 64 |
index 244e3ad..c6a9005 100644 |
| 65 |
--- a/pym/portage/const.py |
| 66 |
+++ b/pym/portage/const.py |
| 67 |
@@ -9,15 +9,6 @@ from portage.const_autotool import * |
| 68 |
|
| 69 |
import os |
| 70 |
|
| 71 |
-# save the original prefix |
| 72 |
-BPREFIX = EPREFIX |
| 73 |
-# pick up EPREFIX from the environment if set |
| 74 |
-if "EPREFIX" in os.environ: |
| 75 |
- if os.environ["EPREFIX"] != "": |
| 76 |
- EPREFIX = os.path.normpath(os.environ["EPREFIX"]) |
| 77 |
- else: |
| 78 |
- EPREFIX = os.environ["EPREFIX"] |
| 79 |
- |
| 80 |
# =========================================================================== |
| 81 |
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF |
| 82 |
# =========================================================================== |
| 83 |
@@ -78,8 +69,8 @@ PORTAGE_PYM_PATH = PORTAGE_BASE_PATH + "/pym" |
| 84 |
LOCALE_DATA_PATH = PORTAGE_BASE_PATH + "/locale" # FIXME: not used |
| 85 |
EBUILD_SH_BINARY = PORTAGE_BIN_PATH + "/ebuild.sh" |
| 86 |
MISC_SH_BINARY = PORTAGE_BIN_PATH + "/misc-functions.sh" |
| 87 |
-SANDBOX_BINARY = BPREFIX + "/usr/bin/sandbox" |
| 88 |
-FAKEROOT_BINARY = BPREFIX + "/usr/bin/fakeroot" |
| 89 |
+SANDBOX_BINARY = EPREFIX + "/usr/bin/sandbox" |
| 90 |
+FAKEROOT_BINARY = EPREFIX + "/usr/bin/fakeroot" |
| 91 |
BASH_BINARY = PORTAGE_BASH |
| 92 |
MOVE_BINARY = PORTAGE_MV |
| 93 |
PRELINK_BINARY = "/usr/sbin/prelink" |
| 94 |
|
| 95 |
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py |
| 96 |
index a7c1033..967b21d 100644 |
| 97 |
--- a/pym/portage/package/ebuild/_config/special_env_vars.py |
| 98 |
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py |
| 99 |
@@ -67,7 +67,7 @@ environ_whitelist += [ |
| 100 |
"ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", |
| 101 |
"USE_EXPAND", "USE_ORDER", "WORKDIR", |
| 102 |
"XARGS", "__PORTAGE_TEST_HARDLINK_LOCKS", |
| 103 |
- "BPREFIX", "DEFAULT_PATH", "EXTRA_PATH", |
| 104 |
+ "DEFAULT_PATH", "EXTRA_PATH", |
| 105 |
"PORTAGE_GROUP", "PORTAGE_USER", |
| 106 |
] |
Archives