diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:24:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:24:27 +0000 |
| commit | e2119019e2cba0f7f8fc6023d7cfeaf8bc210111 (patch) | |
| tree | cb8c857760536f060c7f1fc2238a107e2a112b9e /pym/_emerge | |
| parent | 1da1430e818adacef3a5cbdd614873a8eacca1ed (diff) | |
| download | portage-e2119019e2cba0f7f8fc6023d7cfeaf8bc210111.tar.gz portage-e2119019e2cba0f7f8fc6023d7cfeaf8bc210111.tar.bz2 portage-e2119019e2cba0f7f8fc6023d7cfeaf8bc210111.zip | |
Fix some unwanted interaction between --tree display and unsatisfied
blockers in depgraph.display().
svn path=/main/trunk/; revision=10155
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
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): |