summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-17 07:24:43 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-17 07:24:43 +0000
commit55cd5a52e0101676a46d2e8fbff4eff11ae2b73c (patch)
tree9aa18de75317b64f03a1358e2ae909186f91fd15
parent033e7b68cc5495ab43498a73940be23b919aa5cf (diff)
downloadportage-55cd5a52e0101676a46d2e8fbff4eff11ae2b73c.tar.gz
portage-55cd5a52e0101676a46d2e8fbff4eff11ae2b73c.tar.bz2
portage-55cd5a52e0101676a46d2e8fbff4eff11ae2b73c.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). svn path=/main/trunk/; revision=14624
-rw-r--r--pym/portage/__init__.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2454fbb4f..f4760ec57 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")