| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-31 05:07:28 +0000 (Fri, 31 Oct 2008) |
| 3 |
New Revision: 11763 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/__init__.py |
| 7 |
Log: |
| 8 |
Revert previous commit since it doesn't properly calculate masked and forced |
| 9 |
flags for the package being matched (it erroneously uses the masked and forced |
| 10 |
flags from the parent package). |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/dbapi/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 04:29:51 UTC (rev 11762) |
| 16 |
+++ main/trunk/pym/portage/dbapi/__init__.py 2008-10-31 05:07:28 UTC (rev 11763) |
| 17 |
@@ -169,26 +169,6 @@ |
| 18 |
continue |
| 19 |
if atom.use.disabled.intersection(use): |
| 20 |
continue |
| 21 |
- else: |
| 22 |
- # Check masked and forced flags for repoman. |
| 23 |
- mysettings = getattr(self, "mysettings", None) |
| 24 |
- if mysettings is not None and not mysettings.local_config: |
| 25 |
- |
| 26 |
- usemask = mysettings.usemask |
| 27 |
- conditional = atom.use.conditional |
| 28 |
- if usemask.intersection(atom.use.enabled): |
| 29 |
- continue |
| 30 |
- if conditional is not None and \ |
| 31 |
- usemask.intersection(conditional.enabled): |
| 32 |
- continue |
| 33 |
- |
| 34 |
- useforce = mysettings.useforce.difference(usemask) |
| 35 |
- if useforce.intersection(atom.use.disabled): |
| 36 |
- continue |
| 37 |
- if conditional is not None and \ |
| 38 |
- useforce.intersection(conditional.disabled): |
| 39 |
- continue |
| 40 |
- |
| 41 |
yield cpv |
| 42 |
|
| 43 |
def invalidentry(self, mypath): |
Archives