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 1397e2bd7d3d78dabe5967ec29717b8ce6d680dd..cdf020f441cd800c2178ab534f181d110f272426 100755 (executable)
--- 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: