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 <gentoo-commits+bounces-362048-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Qgic9-0001qN-Kk for garchives@archives.gentoo.org; Tue, 12 Jul 2011 19:27:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B103621C07C; Tue, 12 Jul 2011 19:27:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A1B821C07C for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 19:27:17 +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 DFA462AC20C for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 19:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E63598003D for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2011 19:27:15 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <c12225b59b6ba336a05b5e0b07bd3b51b9d2f012.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: c12225b59b6ba336a05b5e0b07bd3b51b9d2f012 Date: Tue, 12 Jul 2011 19:27:15 +0000 (UTC) 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: X-Archives-Hash: 8e69d8e76d33f69f55ed9992aebe51e0 commit: c12225b59b6ba336a05b5e0b07bd3b51b9d2f012 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Jul 12 19:26:47 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Jul 12 19:26:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc12225b5 resume_depgraph: be careful with parent_node type --- pym/_emerge/depgraph.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8219a77..a5923dd 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6881,8 +6881,9 @@ def _resume_depgraph(settings, trees, mtimedb, myop= ts, 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) + unsatisfied_tuples =3D frozenset(tuple(parent_node) + for parent_node in unsatisfied_parents + if isinstance(parent_node, Package)) pruned_mergelist =3D [] for x in mergelist: if isinstance(x, list) and \