diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-12 08:27:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-12 08:27:48 +0000 |
| commit | beca30200c738ac81351353028b29fd826750a1d (patch) | |
| tree | b241be8eafaa23733d9bc8b6e02474a6517ea282 /pym/_emerge/__init__.py | |
| parent | 980eed3f36cdff6ec6e7c06a8a3d8b8e480746c0 (diff) | |
| download | portage-beca30200c738ac81351353028b29fd826750a1d.tar.gz portage-beca30200c738ac81351353028b29fd826750a1d.tar.bz2 portage-beca30200c738ac81351353028b29fd826750a1d.zip | |
When displaying parents of unsolved blockers, prefer parents that are not
directly involved in a conflict. (trunk r12421)
svn path=/main/branches/2.1.6/; revision=12477
Diffstat (limited to 'pym/_emerge/__init__.py')
| -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 4f292ea41..adb740cd1 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7248,12 +7248,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: |