From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 12 Dec 2009 09:23:11 +0000 (-0000)
Subject: Unset prefix vars for depend phase (even if EAPI is known).
X-Git-Tag: v2.2_rc59~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffe283e40eb5b86dccfcbdc563f774d933bc518a;p=portage.git

Unset prefix vars for depend phase (even if EAPI is known).

svn path=/main/trunk/; revision=15050
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4e0d8cc83..e4ff736c5 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3777,8 +3777,7 @@ class config(object):
 			mydict.pop("AA", None)
 
 		# Prefix variables are supported starting with EAPI 3.
-		# eapi is None for 'depend' phase
-		if eapi in (None, "0", "1", "2"):
+		if phase == 'depend' or eapi in (None, "0", "1", "2"):
 			mydict.pop("ED", None)
 			mydict.pop("EPREFIX", None)
 			mydict.pop("EROOT", None)