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-407400-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RZR3c-0006Ug-0n
for garchives@archives.gentoo.org; Sat, 10 Dec 2011 17:49:56 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A99D921C129;
Sat, 10 Dec 2011 17:49:48 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 7619B21C129
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2011 17:49:48 +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 F01E31B4015
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2011 17:49:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1DC9180042
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Dec 2011 17:49:47 +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: <cacbbe33b839737fecff2b81fc638bb40f08686c.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/config.py
X-VCS-Directories: pym/portage/package/ebuild/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: cacbbe33b839737fecff2b81fc638bb40f08686c
Date: Sat, 10 Dec 2011 17:49:47 +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: 1dcc7d57-d3fb-4b2b-906f-30133e23f0c3
X-Archives-Hash: 1b2a6dd5c15606f0a6fb418860ac6653
commit: cacbbe33b839737fecff2b81fc638bb40f08686c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 17:49:33 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 17:49:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dcacbbe33
config.environ: allow prefix vars if no EAPI
This allows access to EPREFIX inside things like post_sync hooks, where
EAPI is undefined.
---
pym/portage/package/ebuild/config.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e=
build/config.py
index df719e2..9bb26ca 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -2284,9 +2284,9 @@ class config(object):
# useless with prefix configurations. This brings compatibility with
# the prefix branch of portage, which also supports EPREFIX for all
# EAPIs (for obvious reasons).
- if phase =3D=3D 'depend' or eapi is None or \
+ if phase =3D=3D 'depend' or \
('force-prefix' not in self.features and
- not eapi_supports_prefix(eapi)):
+ eapi is not None and not eapi_supports_prefix(eapi)):
mydict.pop("ED", None)
mydict.pop("EPREFIX", None)
mydict.pop("EROOT", None)