From 677a4b93c62040b04fc240ae7f891b4c3ec70534 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 31 Oct 2008 04:29:51 +0000 Subject: Bug #244947 - Add repoman support for checking masked and forced flags when verifying USE deps. Thanks to Brian Harring for reporting. svn path=/main/trunk/; revision=11762 --- pym/portage/dbapi/__init__.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 0900fcfa8..89810eb2f 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -169,6 +169,26 @@ class dbapi(object): continue if atom.use.disabled.intersection(use): continue + else: + # Check masked and forced flags for repoman. + mysettings = getattr(self, "mysettings", None) + if mysettings is not None and not mysettings.local_config: + + usemask = mysettings.usemask + conditional = atom.use.conditional + if usemask.intersection(atom.use.enabled): + continue + if conditional is not None and \ + usemask.intersection(conditional.enabled): + continue + + useforce = mysettings.useforce.difference(usemask) + if useforce.intersection(atom.use.disabled): + continue + if conditional is not None and \ + useforce.intersection(conditional.disabled): + continue + yield cpv def invalidentry(self, mypath): -- cgit v1.2.3-1-g7c22