| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-30 00:01:08 +0000 (Tue, 30 Jun 2009) |
| 3 |
New Revision: 13739 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix virtual blocker code inside _expand_new_virtuals to correctly handle |
| 9 |
!!atom blockers. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-06-29 23:44:55 UTC (rev 13738) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-06-30 00:01:08 UTC (rev 13739) |
| 16 |
@@ -6941,7 +6941,8 @@ |
| 17 |
continue |
| 18 |
match_atom = x |
| 19 |
if isblocker: |
| 20 |
- match_atom = x[1:] |
| 21 |
+ match_atom = x.lstrip("!") |
| 22 |
+ isblocker = x[:-len(match_atom)] |
| 23 |
pkgs = [] |
| 24 |
matches = portdb.match(match_atom) |
| 25 |
# Use descending order to prefer higher versions. |
| 26 |
@@ -7003,7 +7004,7 @@ |
| 27 |
if len(virtual_atoms) == 1: |
| 28 |
# It wouldn't make sense to block all the components of a |
| 29 |
# compound virtual, so only a single atom block is allowed. |
| 30 |
- a.append(portage.dep.Atom("!" + virtual_atoms[0])) |
| 31 |
+ a.append(portage.dep.Atom(isblocker + virtual_atoms[0])) |
| 32 |
else: |
| 33 |
# pull in the new-style virtual |
| 34 |
mycheck[1].append(portage.dep.Atom("="+y[0])) |
Archives