From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-61877-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1JsUpz-0002yI-4V
	for garchives@archives.gentoo.org; Sun, 04 May 2008 03:24:31 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 57F90E03F3;
	Sun,  4 May 2008 03:24:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 34597E03F3
	for <gentoo-commits@lists.gentoo.org>; Sun,  4 May 2008 03:24:30 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 76B2966D97
	for <gentoo-commits@lists.gentoo.org>; Sun,  4 May 2008 03:24:29 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.68)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1JsUpw-0006qx-DS
	for gentoo-commits@lists.gentoo.org; Sun, 04 May 2008 03:24:28 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r10155 - main/trunk/pym/_emerge
X-VCS-Repository: portage
X-VCS-Revision: 10155
X-VCS-Files: main/trunk/pym/_emerge/__init__.py
X-VCS-Directories: main/trunk/pym/_emerge
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1JsUpw-0006qx-DS@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Sun, 04 May 2008 03:24:28 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: ba867b1c-4ae8-4990-89df-64a4f6043c20
X-Archives-Hash: 89308780a234bb32a0b6b582ee26a4a3

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 !=3D inst_pkg:
 						mygraph.add(blocker, parent)
=20
+		unsatisfied_blockers =3D []
 		i =3D 0
 		depth =3D 0
 		shown_edges =3D set()
 		for x in mylist:
+			if isinstance(x, Blocker) and not x.satisfied:
+				unsatisfied_blockers.append(x)
+				continue
 			graph_key =3D x
 			if "--tree" in self.myopts:
 				depth =3D len(tree_nodes)
@@ -4107,6 +4111,8 @@
 			else:
 				display_list.append((x, depth, True))
 		mylist =3D display_list
+		for x in unsatisfied_blockers:
+			mylist.append((x, 0, True))
=20
 		last_merge_depth =3D 0
 		for i in xrange(len(mylist)-1,-1,-1):

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