diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-09 16:15:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-09 16:15:57 +0000 |
| commit | 4e0fe3accad7b1ec15bf2ba8adc6e1b7f9aa8b9c (patch) | |
| tree | 02e15bcce9b020950844e1cb2bb0434ea886439c /bin/emerge | |
| parent | 5f2c6418672a6caf4093dc8cb578c9bbaca65a06 (diff) | |
| download | portage-4e0fe3accad7b1ec15bf2ba8adc6e1b7f9aa8b9c.tar.gz portage-4e0fe3accad7b1ec15bf2ba8adc6e1b7f9aa8b9c.tar.bz2 portage-4e0fe3accad7b1ec15bf2ba8adc6e1b7f9aa8b9c.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
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") |