From: Zac Medico Date: Fri, 31 Oct 2008 05:07:28 +0000 (-0000) Subject: Revert previous commit since it doesn't properly calculate masked and forced X-Git-Tag: v2.2_rc13~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ec501a0fa891b65341446c4ca0f8bf28082a268;p=portage.git Revert previous commit since it doesn't properly calculate masked and forced flags for the package being matched (it erroneously uses the masked and forced flags from the parent package). svn path=/main/trunk/; revision=11763 --- diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 89810eb2f..0900fcfa8 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -169,26 +169,6 @@ 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):