* [gentoo-commits] portage r11763 - main/trunk/pym/portage/dbapi
@ 2008-10-31 5:07 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-10-31 5:07 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-10-31 05:07:28 +0000 (Fri, 31 Oct 2008)
New Revision: 11763
Modified:
main/trunk/pym/portage/dbapi/__init__.py
Log:
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).
Modified: main/trunk/pym/portage/dbapi/__init__.py
===================================================================
--- main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 04:29:51 UTC (rev 11762)
+++ main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 05:07:28 UTC (rev 11763)
@@ -169,26 +169,6 @@
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):
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-31 5:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-31 5:07 [gentoo-commits] portage r11763 - main/trunk/pym/portage/dbapi Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox