Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11762 - main/trunk/pym/portage/dbapi
Date: Fri, 31 Oct 2008 04:29:54
Message-Id: E1Kvldv-0008Sw-G1@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-10-31 04:29:51 +0000 (Fri, 31 Oct 2008)
3 New Revision: 11762
4
5 Modified:
6 main/trunk/pym/portage/dbapi/__init__.py
7 Log:
8 Bug #244947 - Add repoman support for checking masked and forced flags when
9 verifying USE deps. Thanks to Brian Harring for reporting.
10
11
12 Modified: main/trunk/pym/portage/dbapi/__init__.py
13 ===================================================================
14 --- main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 04:26:06 UTC (rev 11761)
15 +++ main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 04:29:51 UTC (rev 11762)
16 @@ -169,6 +169,26 @@
17 continue
18 if atom.use.disabled.intersection(use):
19 continue
20 + else:
21 + # Check masked and forced flags for repoman.
22 + mysettings = getattr(self, "mysettings", None)
23 + if mysettings is not None and not mysettings.local_config:
24 +
25 + usemask = mysettings.usemask
26 + conditional = atom.use.conditional
27 + if usemask.intersection(atom.use.enabled):
28 + continue
29 + if conditional is not None and \
30 + usemask.intersection(conditional.enabled):
31 + continue
32 +
33 + useforce = mysettings.useforce.difference(usemask)
34 + if useforce.intersection(atom.use.disabled):
35 + continue
36 + if conditional is not None and \
37 + useforce.intersection(conditional.disabled):
38 + continue
39 +
40 yield cpv
41
42 def invalidentry(self, mypath):