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 1PosBR-0005BW-GD for garchives@archives.gentoo.org; Mon, 14 Feb 2011 06:45:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B0C8E089B; Mon, 14 Feb 2011 06:45:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 488E8E089B for ; Mon, 14 Feb 2011 06:45:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A5F71B4106 for ; Mon, 14 Feb 2011 06:45:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C95558006A for ; Mon, 14 Feb 2011 06:45:07 +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: <4fd45120a1ec8eb863a0890d947d2d428cfdad55.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: 4fd45120a1ec8eb863a0890d947d2d428cfdad55 Date: Mon, 14 Feb 2011 06:45:07 +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: 9bdc76e0441634aa356931c09631e446 commit: 4fd45120a1ec8eb863a0890d947d2d428cfdad55 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 06:40:57 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 06:40:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4fd45120 depgraph: ignore fewer deps This restores some desired logic that was left out of commit 5655b4dcfe5e9dae5e9d6352d791c3d04953baf7. --- pym/_emerge/depgraph.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8a616dc..b85c132 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1280,7 +1280,9 @@ class depgraph(object): mypriority.satisfied and \ mypriority.satisfied.visible and \ dep.child is not None and \ - not dep.child.installed: + not dep.child.installed and \ + self._dynamic_config._slot_pkg_map[dep.child.root].get( + dep.child.slot_atom) is None: myarg =3D None if dep.root =3D=3D self._frozen_config.target_root: try: @@ -1365,7 +1367,9 @@ class depgraph(object): mypriority.satisfied and \ mypriority.satisfied.visible and \ dep.child is not None and \ - not dep.child.installed: + not dep.child.installed and \ + self._dynamic_config._slot_pkg_map[dep.child.root].get( + dep.child.slot_atom) is None: myarg =3D None if dep.root =3D=3D self._frozen_config.target_root: try: