summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-12-13 03:53:58 +0000
committerZac Medico <zmedico@gentoo.org>2009-12-13 03:53:58 +0000
commit02a8a626fae83bae6456d032465cfe2618571336 (patch)
tree1dd447bf3493a13c5cd13e7c935e539394fc26d5
parente65bf33985894cec62244dd21583b3a16df79a55 (diff)
downloadportage-02a8a626fae83bae6456d032465cfe2618571336.tar.gz
portage-02a8a626fae83bae6456d032465cfe2618571336.tar.bz2
portage-02a8a626fae83bae6456d032465cfe2618571336.zip
Unset prefix vars for depend phase when EAPI is unknown. (trunk r15049)
svn path=/main/branches/2.1.7/; revision=15083
-rw-r--r--pym/portage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index b70c5fe26..04bbfdc87 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3777,7 +3777,8 @@ class config(object):
mydict.pop("AA", None)
# Prefix variables are supported starting with EAPI 3.
- if eapi in ("0", "1", "2"):
+ # eapi is None for 'depend' phase
+ if eapi in (None, "0", "1", "2"):
mydict.pop("ED", None)
mydict.pop("EPREFIX", None)
mydict.pop("EROOT", None)