| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-30 22:49:24 +0000 (Tue, 30 Jun 2009) |
| 3 |
New Revision: 13748 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix _expand_new_virtuals to expand old-style virtuals for package.provided |
| 9 |
entries when there is no other choice. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-06-30 22:06:20 UTC (rev 13747) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-06-30 22:49:24 UTC (rev 13748) |
| 16 |
@@ -6886,6 +6886,7 @@ |
| 17 |
if kwargs["use_binaries"]: |
| 18 |
portdb = trees[myroot]["bintree"].dbapi |
| 19 |
myvirtuals = mysettings.getvirtuals() |
| 20 |
+ pprovideddict = mysettings.pprovideddict |
| 21 |
myuse = kwargs["myuse"] |
| 22 |
for x in mysplit: |
| 23 |
if x == "||": |
| 24 |
@@ -7024,6 +7025,14 @@ |
| 25 |
portdb.aux_get(matches[-1], ['PROVIDE'])[0].split(): |
| 26 |
a.append(new_atom) |
| 27 |
|
| 28 |
+ if not a and not isblocker and mychoices: |
| 29 |
+ # Check for a virtual package.provided match. |
| 30 |
+ for y in mychoices: |
| 31 |
+ new_atom = portage.dep.Atom(x.replace(mykey, y, 1)) |
| 32 |
+ if match_from_list(new_atom, |
| 33 |
+ pprovideddict.get(new_atom.cp, [])): |
| 34 |
+ a.append(new_atom) |
| 35 |
+ |
| 36 |
if not a: |
| 37 |
newsplit.append(x) |
| 38 |
elif len(a) == 1: |
Archives