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 <gentoo-commits+bounces-397644-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RLStE-0001J5-8z
for garchives@archives.gentoo.org; Wed, 02 Nov 2011 04:57:28 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6B85021C028;
Wed, 2 Nov 2011 04:57:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4064021C028
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Nov 2011 04:57:19 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B51771B4028
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Nov 2011 04:57:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id DB54680042
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Nov 2011 04:57:17 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <ab484dc9a2612aa6709fad3ff926c8589a706637.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: ab484dc9a2612aa6709fad3ff926c8589a706637
Date: Wed, 2 Nov 2011 04:57:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 1fc69006-289a-4617-ac92-6f64c623dc88
X-Archives-Hash: cdbc98c78a200f61aa27e4b6ed937239
commit: ab484dc9a2612aa6709fad3ff926c8589a706637
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 2 04:57:10 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 04:57:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dab484dc9
phase-helpers.sh: fix best/has_version for prefix
---
bin/phase-helpers.sh | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 8a2f381..a47064e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -600,11 +600,13 @@ _eapi4_src_install() {
# Takes single depend-type atoms.
has_version() {
=20
+ local eroot=3D${EROOT}
+ case "$EAPI" in 0|1|2) eroot=3D${ROOT} ;; esac
if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
- "$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1"
+ "$PORTAGE_BIN_PATH"/ebuild-ipc has_version "${eroot}" "$1"
else
PYTHONPATH=3D${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" ha=
s_version "${ROOT}" "$1"
+ "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" ha=
s_version "${eroot}" "$1"
fi
local retval=3D$?
case "${retval}" in
@@ -621,11 +623,13 @@ has_version() {
# Takes single depend-type atoms.
best_version() {
=20
+ local eroot=3D${EROOT}
+ case "$EAPI" in 0|1|2) eroot=3D${ROOT} ;; esac
if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
- "$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1"
+ "$PORTAGE_BIN_PATH"/ebuild-ipc best_version "${eroot}" "$1"
else
PYTHONPATH=3D${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" be=
st_version "${ROOT}" "$1"
+ "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" be=
st_version "${eroot}" "$1"
fi
local retval=3D$?
case "${retval}" in