1 |
commit: 77b651300731ec007cd535a83b8ee9a898602783 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 2 20:22:07 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 2 20:22:07 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77b65130 |
7 |
|
8 |
Prefer slot conflict over blocker display. |
9 |
|
10 |
The slot conflict display has better noise reduction than the |
11 |
unsatisfied blockers display, so skip unsatisfied blockers display if |
12 |
there are slot conflicts (see bug #385391). Note that this reverses |
13 |
the logic from bug 159310, since the slot conflict display has evolved |
14 |
a lot since then. |
15 |
|
16 |
--- |
17 |
pym/_emerge/depgraph.py | 11 ++++++----- |
18 |
1 files changed, 6 insertions(+), 5 deletions(-) |
19 |
|
20 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
21 |
index ad04551..66cba04 100644 |
22 |
--- a/pym/_emerge/depgraph.py |
23 |
+++ b/pym/_emerge/depgraph.py |
24 |
@@ -6170,13 +6170,14 @@ class depgraph(object): |
25 |
self._show_circular_deps( |
26 |
self._dynamic_config._circular_deps_for_display) |
27 |
|
28 |
- # The user is only notified of a slot conflict if |
29 |
- # there are no unresolvable blocker conflicts. |
30 |
- if self._dynamic_config._unsatisfied_blockers_for_display is not None: |
31 |
+ # The slot conflict display has better noise reduction than |
32 |
+ # the unsatisfied blockers display, so skip unsatisfied blockers |
33 |
+ # display if there are slot conflicts (see bug #385391). |
34 |
+ if self._dynamic_config._slot_collision_info: |
35 |
+ self._show_slot_collision_notice() |
36 |
+ elif self._dynamic_config._unsatisfied_blockers_for_display is not None: |
37 |
self._show_unsatisfied_blockers( |
38 |
self._dynamic_config._unsatisfied_blockers_for_display) |
39 |
- elif self._dynamic_config._slot_collision_info: |
40 |
- self._show_slot_collision_notice() |
41 |
else: |
42 |
self._show_missed_update() |