From: Zac Medico Date: Sat, 17 Oct 2009 07:24:43 +0000 (-0000) Subject: Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan Callen X-Git-Tag: v2.2_rc47~43 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55cd5a52e0101676a46d2e8fbff4eff11ae2b73c;p=portage.git Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan Callen for the initial patch (I moved the code from spawnebuild to config.environ). svn path=/main/trunk/; revision=14624 --- 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")