summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-16 18:18:33 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-16 18:18:33 +0000
commit15d5b303c2d314f912f68b8084b1793ebc993632 (patch)
treeb9c6cbf4cf77b593c9bf2a960e0e3168591b0748
parentde95d840c0847f56812bf4f001c5a2b151fab672 (diff)
downloadportage-15d5b303c2d314f912f68b8084b1793ebc993632.tar.gz
portage-15d5b303c2d314f912f68b8084b1793ebc993632.tar.bz2
portage-15d5b303c2d314f912f68b8084b1793ebc993632.zip
When unable to navigate around blockers, add them back to the main digraph so that the --tree display can show them properly. This fixes the KeyError reported in comment #15 of bug #151331
svn path=/main/trunk/; revision=4726
-rwxr-xr-xbin/emerge6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 4d700ef19..86bf640b0 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1457,8 +1457,10 @@ class depgraph:
if not myblockers.child_nodes(blocker):
myblockers.remove(blocker)
- if not myblockers.is_empty():
- retlist.extend([node.split() for node in myblockers.root_nodes()])
+ for node in myblockers.root_nodes():
+ retlist.append(node.split())
+ for parent in self.blocker_parents[node]:
+ self.digraph.add(node, parent)
return retlist