summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-08-31 23:48:25 -0700
committerZac Medico <zmedico@gentoo.org>2011-08-31 23:48:25 -0700
commit22c76160f6a905500c7d217efeae8c58a8298581 (patch)
tree959bd6d2eae9e6f76704604147842eb3dcfc5e38 /pym
parent0d79d130c27af4ba9676c9297639e064d18d9528 (diff)
downloadportage-22c76160f6a905500c7d217efeae8c58a8298581.tar.gz
portage-22c76160f6a905500c7d217efeae8c58a8298581.tar.bz2
portage-22c76160f6a905500c7d217efeae8c58a8298581.zip
doebuild_environment: include EPREFIX in ED
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/package/ebuild/doebuild.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 45b28631c..7b3561e77 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -268,7 +268,9 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")
# Prefix forward compatability
- mysettings["ED"] = mysettings["D"]
+ eprefix_lstrip = mysettings["EPREFIX"].lstrip(os.sep)
+ mysettings["ED"] = os.path.join(
+ mysettings["D"], eprefix_lstrip).rstrip(os.sep) + os.sep
mysettings["PORTAGE_BASHRC"] = os.path.join(
mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE)