diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:54:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:54:07 +0000 |
| commit | 2605482429e1263404b39efb13307e7bd5d1196f (patch) | |
| tree | d1665c6213de4e895f55b412918bccb665ee86c5 | |
| parent | 02a8a626fae83bae6456d032465cfe2618571336 (diff) | |
| download | portage-2605482429e1263404b39efb13307e7bd5d1196f.tar.gz portage-2605482429e1263404b39efb13307e7bd5d1196f.tar.bz2 portage-2605482429e1263404b39efb13307e7bd5d1196f.zip | |
Unset prefix vars for depend phase (even if EAPI is known). (trunk r15050)
svn path=/main/branches/2.1.7/; revision=15084
| -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 04bbfdc87..4a6f8fd85 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) |