In _expand_new_virtuals, don't expand old-style virtuals when there is

a new-style match.

svn path=/main/trunk/; revision=13741

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index f98dbbb1d021b819c3206f5f573131e30ef9d2c7..99715c740e42668d0591ef5d85645283c6d12cdb 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7010,8 +7010,9 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
                                mycheck[1].append(portage.dep.Atom("="+y[0]))
                                a.append(mycheck[1])
                # Plain old-style virtuals.  New-style virtuals are preferred.
-               for y in mychoices:
-                       a.append(portage.dep.Atom(x.replace(mykey, y, 1)))
+               if not pkgs:
+                       for y in mychoices:
+                               a.append(portage.dep.Atom(x.replace(mykey, y, 1)))
                if isblocker and not a:
                        # Probably a compound virtual.  Pass the atom through unprocessed.
                        newsplit.append(x)