From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4D938138986 for ; Mon, 11 Feb 2013 02:25:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8207221C001; Mon, 11 Feb 2013 02:25:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EF1521C001 for ; Mon, 11 Feb 2013 02:25:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16AD733E571 for ; Mon, 11 Feb 2013 02:25:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9A494E4073 for ; Mon, 11 Feb 2013 02:25:03 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1360549491.e64dd7eb67c3a2fc7aa6c6e42d6df156d1553c8f.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: e64dd7eb67c3a2fc7aa6c6e42d6df156d1553c8f X-VCS-Branch: master Date: Mon, 11 Feb 2013 02:25:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99e81c68-bc70-4e06-aab2-64d80b1777b6 X-Archives-Hash: 59c7671f1a37b4529d5e8cd2ac19eeae commit: e64dd7eb67c3a2fc7aa6c6e42d6df156d1553c8f Author: Zac Medico gentoo org> AuthorDate: Mon Feb 11 02:24:51 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 11 02:24:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e64dd7eb _slot_change_probe: handle masks --- pym/_emerge/depgraph.py | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 34a4604..c356010 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1045,15 +1045,27 @@ class depgraph(object): return None root_config = self._frozen_config.roots[dep.root] + matches = [] try: - unbuilt_child = self._pkg(dep.child.cpv, "ebuild", - root_config, myrepo=dep.child.repo) + matches.append(self._pkg(dep.child.cpv, "ebuild", + root_config, myrepo=dep.child.repo)) except PackageNotFound: - for unbuilt_child in self._iter_match_pkgs(root_config, - "ebuild", Atom("=%s" % (dep.child.cpv,))): - break - else: - return None + pass + + for unbuilt_child in chain(matches, + self._iter_match_pkgs(root_config, "ebuild", + Atom("=%s" % (dep.child.cpv,)))): + if unbuilt_child in self._dynamic_config._runtime_pkg_mask: + continue + if self._frozen_config.excluded_pkgs.findAtomForPackage( + unbuilt_child, + modified_use=self._pkg_use_enabled(unbuilt_child)): + continue + if not self._pkg_visibility_check(unbuilt_child): + continue + break + else: + return None if unbuilt_child.slot == dep.child.slot and \ unbuilt_child.sub_slot == dep.child.sub_slot: