When depgraph.select_files() expands an atom category, in case of an old-style

virtual, defer category expansion so that the depgraph has more choices.
(trunk r9769)

svn path=/main/branches/2.1.2/; revision=9770

diff --git a/bin/emerge b/bin/emerge
index ec76cd1f2b9bd3b033a5dc2b5a40f1c70e7a02bf..27fac55ab667258b87d3ca9791719b12a70a3301 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2376,8 +2376,8 @@ class depgraph(object):
                                        cat, atom_pn = portage.catsplit(null_cp)
                                        virts_p = root_config.settings.get_virts_p().get(atom_pn)
                                        if virts_p:
-                                               virt_cp = portage.dep_getkey(virts_p[0])
-                                               atom = null_atom.replace(null_cp, virt_cp)
+                                               # Allow the depgraph to choose which virtual.
+                                               atom = insert_category_into_atom(x, "virtual")
                                        else:
                                                atom = insert_category_into_atom(x, "null")