summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-12-08 19:41:09 +0000
committerZac Medico <zmedico@gentoo.org>2009-12-08 19:41:09 +0000
commit6626ada74c71410161261f075a3100e4b7f0d860 (patch)
tree6c75a2cafc3108d8a1ccf344569039fb868f4ef2 /pym/portage
parentcb95fed24283dfd591770d5ec6b6de5516714da7 (diff)
downloadportage-6626ada74c71410161261f075a3100e4b7f0d860.tar.gz
portage-6626ada74c71410161261f075a3100e4b7f0d860.tar.bz2
portage-6626ada74c71410161261f075a3100e4b7f0d860.zip
Bump EAPI conditionals to account for rename of EAPI 3 to 4. Thanks to
Jonathan Callen <abcd@g.o> for this patch. svn path=/main/trunk/; revision=14965
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 18cb707e0..45e5407f8 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3748,7 +3748,7 @@ class config(object):
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"):
+ if eapi not in ("0", "1", "2", "3"):
mydict.pop("AA", None)
# sandbox's bashrc sources /etc/profile which unsets ROOTPATH,
@@ -5613,7 +5613,7 @@ def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0,
if mydo == "prepare" and eapi in ("0", "1"):
return os.EX_OK
- if mydo == "pretend" and eapi in ("0", "1", "2"):
+ if mydo == "pretend" and eapi in ("0", "1", "2", "3"):
return os.EX_OK
kwargs = actionmap[mydo]["args"]
@@ -6041,8 +6041,8 @@ def _spawn_misc_sh(mysettings, commands, phase=None, **kwargs):
return rval
-_testing_eapis = frozenset(["3_pre1"])
-_deprecated_eapis = frozenset(["2_pre3", "2_pre2", "2_pre1"])
+_testing_eapis = frozenset(["4_pre1"])
+_deprecated_eapis = frozenset(["3_pre1", "2_pre3", "2_pre2", "2_pre1"])
def _eapi_is_deprecated(eapi):
return eapi in _deprecated_eapis
@@ -6261,7 +6261,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
mysettings["PORTAGE_BUILDDIR"], ".exit_status")
#set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent.
- if eapi not in ('0', '1', '2'):
+ if eapi not in ('0', '1', '2', '3'):
# Discard KV for EAPIs that don't support it. Cache KV is restored
# from the backupenv whenever config.reset() is called.
mysettings.pop('KV', None)