From e2119019e2cba0f7f8fc6023d7cfeaf8bc210111 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 May 2008 03:24:27 +0000 Subject: Fix some unwanted interaction between --tree display and unsatisfied blockers in depgraph.display(). svn path=/main/trunk/; revision=10155 --- pym/_emerge/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index af1177991..40960ab1a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4045,10 +4045,14 @@ class depgraph(object): if parent != inst_pkg: mygraph.add(blocker, parent) + unsatisfied_blockers = [] i = 0 depth = 0 shown_edges = set() for x in mylist: + if isinstance(x, Blocker) and not x.satisfied: + unsatisfied_blockers.append(x) + continue graph_key = x if "--tree" in self.myopts: depth = len(tree_nodes) @@ -4107,6 +4111,8 @@ class depgraph(object): else: display_list.append((x, depth, True)) mylist = display_list + for x in unsatisfied_blockers: + mylist.append((x, 0, True)) last_merge_depth = 0 for i in xrange(len(mylist)-1,-1,-1): -- cgit v1.2.3-1-g7c22