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.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 33e2639daae896469376d2e54fbddaf2c18e1b13..eaca00b3a825293d72bddbd525f99e60a4f73863 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2237,8 +2237,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")