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 1QrLwG-00076T-I3 for garchives@archives.gentoo.org; Thu, 11 Aug 2011 03:28:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACDD921C111; Thu, 11 Aug 2011 03:28:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 80EA821C111 for ; Thu, 11 Aug 2011 03:28:00 +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 1513B1B401D for ; Thu, 11 Aug 2011 03:28:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6563080040 for ; Thu, 11 Aug 2011 03:27:59 +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: <72137f634878c4b0ef54287dd4a33fa2240a68f7.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: 72137f634878c4b0ef54287dd4a33fa2240a68f7 Date: Thu, 11 Aug 2011 03:27:59 +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: b164ea8ca0afe2ef0508d563bc60161d commit: 72137f634878c4b0ef54287dd4a33fa2240a68f7 Author: Zac Medico gentoo org> AuthorDate: Thu Aug 11 03:27:45 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 11 03:27:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D72137f63 resume_depgraph: prune all indirect unsatisfied This should fix some cases of bug 378187. --- pym/_emerge/depgraph.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5b48aca..8b6125d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6869,12 +6869,12 @@ def _resume_depgraph(settings, trees, mtimedb, my= opts, myparams, spinner): if not isinstance(parent_node, Package) \ or parent_node.operation not in ("merge", "nomerge"): continue - unsatisfied =3D \ - graph.child_nodes(parent_node, - ignore_priority=3DDepPrioritySatisfiedRange.ignore_soft) - if pkg in unsatisfied: - unsatisfied_parents[parent_node] =3D parent_node - unsatisfied_stack.append(parent_node) + # We need to traverse all priorities here, in order to + # ensure that a package with an unsatisfied depenedency + # won't get pulled in, even indirectly via a soft + # dependency. + unsatisfied_parents[parent_node] =3D parent_node + unsatisfied_stack.append(parent_node) =20 unsatisfied_tuples =3D frozenset(tuple(parent_node) for parent_node in unsatisfied_parents