diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:50:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:50:56 +0000 |
| commit | b2a3d90d9c72fe24b834043521aae28774191a2b (patch) | |
| tree | 684b3c257ea6e40699b88c6cd4951a26988f2316 /pym | |
| parent | e816d756c923916cb980f473f51af94d26d76429 (diff) | |
| download | portage-b2a3d90d9c72fe24b834043521aae28774191a2b.tar.gz portage-b2a3d90d9c72fe24b834043521aae28774191a2b.tar.bz2 portage-b2a3d90d9c72fe24b834043521aae28774191a2b.zip | |
Add EAPI 3_pre2 to conditinals so the EAPI 4 stuff is disabled. (trunk r15035)
svn path=/main/branches/2.1.7/; revision=15069
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 6 | ||||
| -rw-r--r-- | pym/repoman/checks.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1e64ef610..709abb9c3 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3777,7 +3777,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", "3"): + if eapi not in ("0", "1", "2", "3", "3_pre2"): mydict.pop("AA", None) # Prefix variables are supported starting with EAPI 3. @@ -5649,7 +5649,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", "3"): + if mydo == "pretend" and eapi in ("0", "1", "2", "3", "3_pre2"): return os.EX_OK kwargs = actionmap[mydo]["args"] @@ -6304,7 +6304,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', '3'): + if eapi not in ('0', '1', '2', '3', '3_pre2'): # 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) diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index ce72e36ea..3156894f6 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -436,7 +436,7 @@ class Eapi4IncompatibleFuncs(LineCheck): self.eapi = pkg.metadata['EAPI'] def check_eapi(self, eapi): - return self.eapi not in ('0', '1', '2', '3') + return self.eapi not in ('0', '1', '2', '3', '3_pre2') def check(self, num, line): m = self.banned_commands_re.match(line) @@ -453,7 +453,7 @@ class Eapi4GoneVars(LineCheck): self.eapi = pkg.metadata['EAPI'] def check_eapi(self, eapi): - return self.eapi not in ('0', '1', '2', '3') + return self.eapi not in ('0', '1', '2', '3', '3_pre2') def check(self, num, line): m = self.undefined_vars_re.match(line) |