diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-12 09:23:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-12 09:23:11 +0000 |
| commit | ffe283e40eb5b86dccfcbdc563f774d933bc518a (patch) | |
| tree | dfce1955999b41d2f0d4b7ce74d6b0ea88a7ba78 /pym | |
| parent | 73bb014c5cb688d84fd30527010c9af1a46449bf (diff) | |
| download | portage-ffe283e40eb5b86dccfcbdc563f774d933bc518a.tar.gz portage-ffe283e40eb5b86dccfcbdc563f774d933bc518a.tar.bz2 portage-ffe283e40eb5b86dccfcbdc563f774d933bc518a.zip | |
Unset prefix vars for depend phase (even if EAPI is known).
svn path=/main/trunk/; revision=15050
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
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) |