From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qz16X-0000bz-Aj for garchives@archives.gentoo.org; Thu, 01 Sep 2011 06:50:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F196121C15B; Thu, 1 Sep 2011 06:50:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C084721C15B for ; Thu, 1 Sep 2011 06:50:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C0151B401D for ; Thu, 1 Sep 2011 06:50:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 965DD80042 for ; Thu, 1 Sep 2011 06:50:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <22c76160f6a905500c7d217efeae8c58a8298581.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 22c76160f6a905500c7d217efeae8c58a8298581 Date: Thu, 1 Sep 2011 06:50:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ba5b36d9eda44c39ddc45b41c427a868 commit: 22c76160f6a905500c7d217efeae8c58a8298581 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 1 06:48:25 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 1 06:48:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D22c76160 doebuild_environment: include EPREFIX in ED --- pym/portage/package/ebuild/doebuild.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 45b2863..7b3561e 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=3DNon= e, settings=3DNone, mysettings["T"] =3D os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp"= ) =20 # Prefix forward compatability - mysettings["ED"] =3D mysettings["D"] + eprefix_lstrip =3D mysettings["EPREFIX"].lstrip(os.sep) + mysettings["ED"] =3D os.path.join( + mysettings["D"], eprefix_lstrip).rstrip(os.sep) + os.sep =20 mysettings["PORTAGE_BASHRC"] =3D os.path.join( mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE)