| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-30 04:13:47 +0000 (Tue, 30 Jun 2009) |
| 3 |
New Revision: 13741 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In _expand_new_virtuals, don't expand old-style virtuals when there is |
| 9 |
a new-style match. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-06-30 01:16:53 UTC (rev 13740) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-06-30 04:13:47 UTC (rev 13741) |
| 16 |
@@ -7010,8 +7010,9 @@ |
| 17 |
mycheck[1].append(portage.dep.Atom("="+y[0])) |
| 18 |
a.append(mycheck[1]) |
| 19 |
# Plain old-style virtuals. New-style virtuals are preferred. |
| 20 |
- for y in mychoices: |
| 21 |
- a.append(portage.dep.Atom(x.replace(mykey, y, 1))) |
| 22 |
+ if not pkgs: |
| 23 |
+ for y in mychoices: |
| 24 |
+ a.append(portage.dep.Atom(x.replace(mykey, y, 1))) |
| 25 |
if isblocker and not a: |
| 26 |
# Probably a compound virtual. Pass the atom through unprocessed. |
| 27 |
newsplit.append(x) |
Archives