From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 9 Apr 2008 16:15:57 +0000 (-0000)
Subject: When depgraph.select_files() expands an atom category, in case of an old-style
X-Git-Tag: v2.1.5~225
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e0fe3accad7b1ec15bf2ba8adc6e1b7f9aa8b9c;p=portage.git

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 ec76cd1f2..27fac55ab 100755
--- 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")