diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-31 05:07:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-31 05:07:28 +0000 |
| commit | 6ec501a0fa891b65341446c4ca0f8bf28082a268 (patch) | |
| tree | d80cd70dec1b7fdaf901f8f94059850fa6cfc6bd | |
| parent | 677a4b93c62040b04fc240ae7f891b4c3ec70534 (diff) | |
| download | portage-6ec501a0fa891b65341446c4ca0f8bf28082a268.tar.gz portage-6ec501a0fa891b65341446c4ca0f8bf28082a268.tar.bz2 portage-6ec501a0fa891b65341446c4ca0f8bf28082a268.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 20 |
1 files changed, 0 insertions, 20 deletions
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): |