| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-02 23:39:22 +0000 (Tue, 02 Dec 2008) |
| 3 |
New Revision: 12138 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix depgraph._dep_check_composite_db._visible() to reject installed packages |
| 9 |
that are masked. This is necessary for correct choices in || deps when we |
| 10 |
want to ensure that installed masked packages are not preferred over other |
| 11 |
available choices that are not masked. Thanks to Jan Kundr?\195?\161t <jkt@g.o> for |
| 12 |
reporting this issue and testing the patch. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/pym/_emerge/__init__.py 2008-12-02 22:39:22 UTC (rev 12137) |
| 18 |
+++ main/trunk/pym/_emerge/__init__.py 2008-12-02 23:39:22 UTC (rev 12138) |
| 19 |
@@ -8217,13 +8217,13 @@ |
| 20 |
arg = None |
| 21 |
if arg: |
| 22 |
return False |
| 23 |
- if pkg.installed: |
| 24 |
- try: |
| 25 |
- if not visible( |
| 26 |
- self._depgraph.pkgsettings[pkg.root], pkg): |
| 27 |
- return False |
| 28 |
- except portage.exception.InvalidDependString: |
| 29 |
- pass |
| 30 |
+ if pkg.installed: |
| 31 |
+ try: |
| 32 |
+ if not visible( |
| 33 |
+ self._depgraph.pkgsettings[pkg.root], pkg): |
| 34 |
+ return False |
| 35 |
+ except portage.exception.InvalidDependString: |
| 36 |
+ pass |
| 37 |
return True |
| 38 |
|
| 39 |
def _dep_expand(self, atom): |
Archives