diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-10 23:01:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-10 23:01:22 +0000 |
| commit | feaaa1b24d1bfd473558d90a6047e869a1616718 (patch) | |
| tree | ef79d43883c47b6b0b71ab612bb3ff53e981b8d7 | |
| parent | 4bea9a9cb276cf0de9e29cbaabf5fae50ea1e5f1 (diff) | |
| download | portage-feaaa1b24d1bfd473558d90a6047e869a1616718.tar.gz portage-feaaa1b24d1bfd473558d90a6047e869a1616718.tar.bz2 portage-feaaa1b24d1bfd473558d90a6047e869a1616718.zip | |
When displaying parents of unsolved blockers, prefer parents that are not
directly involved in a conflict.
svn path=/main/trunk/; revision=12421
| -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 6e0d4e49c..30b494065 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7264,12 +7264,12 @@ class depgraph(object): pruned_list = set() - # Prefer conflict packages over others. + # Prefer packages that are not directly involved in a conflict. for parent_atom in parent_atoms: if len(pruned_list) >= max_parents: break parent, atom = parent_atom - if parent in conflict_pkgs: + if parent not in conflict_pkgs: pruned_list.add(parent_atom) for parent_atom in parent_atoms: |