diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-06-14 11:53:38 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-18 13:22:36 -0700 |
| commit | 9afaa2a2da9dc36dee158bfb3fcef9f7bac31f37 (patch) | |
| tree | 88c95f86b53a27bc03d5da4a1f354f0f22924ec5 | |
| parent | 951256c5e02e3b763ab1701f8147a16e91eabb77 (diff) | |
| download | portage-9afaa2a2da9dc36dee158bfb3fcef9f7bac31f37.tar.gz portage-9afaa2a2da9dc36dee158bfb3fcef9f7bac31f37.tar.bz2 portage-9afaa2a2da9dc36dee158bfb3fcef9f7bac31f37.zip | |
_show_circular_deps: Stop prunning the graph to show (other) parents of the involved packages in the merge list
| -rw-r--r-- | pym/_emerge/depgraph.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 1cc2d67b2..52d3a9d4a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4100,25 +4100,11 @@ class depgraph(object): return retlist, scheduler_graph def _show_circular_deps(self, mygraph): - # No leaf nodes are available, so we have a circular - # dependency panic situation. Reduce the noise level to a - # minimum via repeated elimination of root nodes since they - # have no parents and thus can not be part of a cycle. - while True: - root_nodes = mygraph.root_nodes( - ignore_priority=DepPrioritySatisfiedRange.ignore_medium_soft) - if not root_nodes: - break - mygraph.difference_update(root_nodes) - shortest_cycle = None for cycle in mygraph.get_cycles(ignore_priority=DepPrioritySatisfiedRange.ignore_medium_soft): if not shortest_cycle or len(shortest_cycle) > len(cycle): shortest_cycle = cycle - if shortest_cycle: - mygraph.difference_update(set(mygraph.order) - set(shortest_cycle)) - # Display the USE flags that are enabled on nodes that are part # of dependency cycles in case that helps the user decide to # disable some of them. |