Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9577 - main/branches/2.1.2/bin
Date: Fri, 28 Mar 2008 13:07:09
Message-Id: E1JfEIU-0007Zt-Aw@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-03-28 13:07:05 +0000 (Fri, 28 Mar 2008)
3 New Revision: 9577
4
5 Modified:
6 main/branches/2.1.2/bin/repoman
7 Log:
8 Bug #213629 - Use EAPI.incompatible in cases where EAPI=0 and a default
9 IUSE is encountered.
10
11
12 Modified: main/branches/2.1.2/bin/repoman
13 ===================================================================
14 --- main/branches/2.1.2/bin/repoman 2008-03-28 13:05:40 UTC (rev 9576)
15 +++ main/branches/2.1.2/bin/repoman 2008-03-28 13:07:05 UTC (rev 9577)
16 @@ -1679,8 +1679,15 @@
17 for mypos in range(len(myuse)-1,-1,-1):
18 if myuse[mypos] and (myuse[mypos] in luselist[mykey]):
19 del myuse[mypos]
20 - if default_use and myaux["EAPI"] == "0":
21 - myuse += default_use
22 +
23 + if default_use and eapi == "0":
24 + for myflag in default_use:
25 + stats['EAPI.incompatible'] += 1
26 + fails['EAPI.incompatible'].append(
27 + (relative_path + ": IUSE defaults" + \
28 + " not supported with EAPI='%s':" + \
29 + " '%s'") % (eapi, myflag))
30 +
31 for mypos in range(len(myuse)):
32 stats["IUSE.invalid"]=stats["IUSE.invalid"]+1
33 fails["IUSE.invalid"].append(x+"/"+y+".ebuild: %s" % myuse[mypos])
34
35 --
36 gentoo-commits@l.g.o mailing list