diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-09 16:14:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-09 16:14:55 +0000 |
| commit | d77891ef525d9b913fa8c3a320ff10bc355d4d6f (patch) | |
| tree | 10a7e31a8e04f9d6072f5833cf6bda0cf1a0da79 | |
| parent | edfd1dc6682e186ff36dba57cff960b1fec0800c (diff) | |
| download | portage-d77891ef525d9b913fa8c3a320ff10bc355d4d6f.tar.gz portage-d77891ef525d9b913fa8c3a320ff10bc355d4d6f.tar.bz2 portage-d77891ef525d9b913fa8c3a320ff10bc355d4d6f.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.
svn path=/main/trunk/; revision=9769
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 33e2639da..eaca00b3a 100644 --- 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") |