From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Jun 2009 04:13:47 +0000 (-0000)
Subject: In _expand_new_virtuals, don't expand old-style virtuals when there is
X-Git-Tag: v2.2_rc34~119
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5624d5f205423b19613822b3ef9cb3a2d961a5e3;p=portage.git

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 f98dbbb1d..99715c740 100644
--- 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)