public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r10155 - main/trunk/pym/_emerge
@ 2008-05-04  3:24 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-04  3:24 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2008-05-04 03:24:27 +0000 (Sun, 04 May 2008)
New Revision: 10155

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Fix some unwanted interaction between --tree display and unsatisfied
blockers in depgraph.display().


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-05-04 02:10:55 UTC (rev 10154)
+++ main/trunk/pym/_emerge/__init__.py	2008-05-04 03:24:27 UTC (rev 10155)
@@ -4045,10 +4045,14 @@
 					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 @@
 			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):

-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-04  3:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-04  3:24 [gentoo-commits] portage r10155 - main/trunk/pym/_emerge Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox