From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 22:03:56 +0000 (-0000)
Subject: Prevent premature expansion of old-style virtuals
X-Git-Tag: v2.1.5~279
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5f8d723508b43f4c37e1aa46161fcb5ba56450e;p=portage.git

Prevent premature expansion of old-style virtuals
inside depgraph.select_files(). (trunk r8306)

svn path=/main/branches/2.1.2/; revision=9638
---

diff --git a/bin/emerge b/bin/emerge
index 1397e2bd7..cdf020f44 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1996,6 +1996,16 @@ class depgraph:
 					portage.writemsg("!!! Please check ebuild(5) for full details.\n")
 					portage.writemsg("!!! (Did you specify a version but forget to prefix with '='?)\n")
 					return (0,[])
+				# Don't expand categories or old-style virtuals here unless
+				# necessary. Expansion of old-style virtuals here causes at
+				# least the following problems:
+				#   1) It's more difficult to determine which set(s) an atom
+				#      came from, if any.
+				#   2) It takes away freedom from the resolver to choose other
+				#      possible expansions when necessary.
+				if "/" in x:
+					arg_atoms.append((x, x))
+					continue
 				try:
 					mykey = None
 					if "--usepkg" in self.myopts: