From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QgK88-0004Gy-4T for garchives@archives.gentoo.org; Mon, 11 Jul 2011 17:18:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 293EC21C32D; Mon, 11 Jul 2011 17:18:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F02B221C32D for ; Mon, 11 Jul 2011 17:18:40 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 689AB2AC1BC for ; Mon, 11 Jul 2011 17:18:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8BDFC8003D for ; Mon, 11 Jul 2011 17:18:39 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <5d8804712e9f49308f17f7fbb889edb048fa6c3a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5d8804712e9f49308f17f7fbb889edb048fa6c3a Date: Mon, 11 Jul 2011 17:18:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8bc230e0caf55070dc1e43b4dd2dac78 commit: 5d8804712e9f49308f17f7fbb889edb048fa6c3a Author: Zac Medico gentoo org> AuthorDate: Mon Jul 11 17:17:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 11 17:17:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5d880471 resume_depgraph: fix breakage from reposyntax This is a major regression that has been triggering lots of complaints about emerge --keep-going. --- pym/_emerge/depgraph.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a4b04f6..549ce7f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6879,10 +6879,12 @@ def _resume_depgraph(settings, trees, mtimedb, my= opts, myparams, spinner): unsatisfied_parents[parent_node] =3D parent_node unsatisfied_stack.append(parent_node) =20 + unsatisfied_tuples =3D set(tuple(pkg) + for pkg in unsatisfied_parents) pruned_mergelist =3D [] for x in mergelist: if isinstance(x, list) and \ - tuple(x) not in unsatisfied_parents: + tuple(x) not in unsatisfied_tuples: pruned_mergelist.append(x) =20 # If the mergelist doesn't shrink then this loop is infinite.