| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-22 01:43:38 +0000 (Sat, 22 Nov 2008) |
| 3 |
New Revision: 12025 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix some cases in dep_zapdeps() where blocker atoms are inappropriately tested |
| 9 |
for availablity. Thanks to Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> for |
| 10 |
reporting. (trunk r12024) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.6/pym/portage/__init__.py 2008-11-22 01:33:24 UTC (rev 12024) |
| 16 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2008-11-22 01:43:38 UTC (rev 12025) |
| 17 |
@@ -6372,6 +6372,8 @@ |
| 18 |
all_available = True |
| 19 |
versions = {} |
| 20 |
for atom in atoms: |
| 21 |
+ if atom[:1] == "!": |
| 22 |
+ continue |
| 23 |
avail_pkg = mydbapi.match(atom) |
| 24 |
if avail_pkg: |
| 25 |
avail_pkg = avail_pkg[-1] # highest (ascending order) |
| 26 |
@@ -6389,7 +6391,8 @@ |
| 27 |
# If any version of a package is installed then we assume that it |
| 28 |
# is preferred over other possible packages choices. |
| 29 |
all_installed = True |
| 30 |
- for atom in set([dep_getkey(atom) for atom in atoms]): |
| 31 |
+ for atom in set([dep_getkey(atom) for atom in atoms \ |
| 32 |
+ if atom[:1] != "!"]): |
| 33 |
# New-style virtuals have zero cost to install. |
| 34 |
if not vardb.match(atom) and not atom.startswith("virtual/"): |
| 35 |
all_installed = False |
Archives