diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:57:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:57:58 +0000 |
| commit | 77cbc5e38abb9ae17bb7f9d9216c1370a8cae574 (patch) | |
| tree | 39c257e876a5f0c6e7fcdabcf1c2fe1ee2e31a54 | |
| parent | Use short substitution syntax in use_with() and use_enable(). Thanks to (diff) | |
| download | portage-multirepo-77cbc5e38abb9ae17bb7f9d9216c1370a8cae574.tar.gz portage-multirepo-77cbc5e38abb9ae17bb7f9d9216c1370a8cae574.tar.bz2 portage-multirepo-77cbc5e38abb9ae17bb7f9d9216c1370a8cae574.zip | |
Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan Callen <abcd@g.o>
for the initial patch (I moved the code from spawnebuild to config.environ).
(trunk r14624)
svn path=/main/branches/2.1.7/; revision=14652
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 2cacd966..3beb618f 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3699,6 +3699,7 @@ class config(object): mydict={} environ_filter = self._environ_filter + eapi = self.get('EAPI') phase = self.get('EBUILD_PHASE') filter_calling_env = False if phase not in ('clean', 'cleanrm', 'depend'): @@ -3743,6 +3744,10 @@ class config(object): # Filtered by IUSE and implicit IUSE. mydict["USE"] = self.get("PORTAGE_USE", "") + # Don't export AA to the ebuild environment in EAPIs that forbid it + if eapi not in ("0", "1", "2"): + mydict.pop("AA", None) + # sandbox's bashrc sources /etc/profile which unsets ROOTPATH, # so we have to back it up and restore it. rootpath = mydict.get("ROOTPATH") |