Gentoo Archives: gentoo-portage-dev

From: Brian Dolbec <dolsen@g.o>
To: gentoo-portage-dev@l.g.o
Subject: Re: [gentoo-portage-dev] [PATCH] Fix off-by-one error in supported EAPI list
Date: Sun, 17 Aug 2014 18:46:08
Message-Id: 20140817114455.2efbd62a.dolsen@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH] Fix off-by-one error in supported EAPI list by "Michał Górny"
1 On Sun, 17 Aug 2014 20:37:10 +0200
2 Michał Górny <mgorny@g.o> wrote:
3
4 > Fix the off-by-one error in construction of supported EAPI list that
5 > resulted in EAPI 5 being considered unsupported.
6 > ---
7 > pym/portage/__init__.py | 2 +-
8 > 1 file changed, 1 insertion(+), 1 deletion(-)
9 >
10 > diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
11 > index fdbc4a8..18b2599 100644
12 > --- a/pym/portage/__init__.py
13 > +++ b/pym/portage/__init__.py
14 > @@ -493,7 +493,7 @@ _doebuild_manifest_exempt_depend = 0
15 >
16 > _testing_eapis = frozenset(["4-python", "4-slot-abi", "5-progress",
17 > "5-hdepend"]) _deprecated_eapis = frozenset(["4_pre1", "3_pre2",
18 > "3_pre1", "5_pre1", "5_pre2"]) -_supported_eapis = frozenset([str(x)
19 > for x in range(portage.const.EAPI)] + list(_testing_eapis) +
20 > list(_deprecated_eapis)) +_supported_eapis = frozenset([str(x) for x
21 > in range(portage.const.EAPI + 1)] + list(_testing_eapis) +
22 > list(_deprecated_eapis)) def _eapi_is_deprecated(eapi): return eapi
23 > in _deprecated_eapis
24
25 Hmm, I thought EAPI was suppose to be a string...
26
27 from portage/const.py:
28
29 EAPI = 5
30
31 which is clearly an integer.
32
33 Shouldn't it be a list of supported EAPI's if it is a string?
34 Then you'd also have to change the range() use to a len of EAPI.split()
35
36
37 --
38 Brian Dolbec <dolsen>

Replies