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 A71191384B4 for ; Sun, 13 Dec 2015 23:40:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25A8321C007; Sun, 13 Dec 2015 23:40:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8243E21C007 for ; Sun, 13 Dec 2015 23:40:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 326AC33FD3F for ; Sun, 13 Dec 2015 23:40:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13B51C88 for ; Sun, 13 Dec 2015 23:39:59 +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: <1450049867.7cbd04cd62c8f13ed41e07ff8bc9b7e5d5ac700b.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: 7cbd04cd62c8f13ed41e07ff8bc9b7e5d5ac700b X-VCS-Branch: master Date: Sun, 13 Dec 2015 23:39: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 X-Archives-Salt: e59b3a83-9696-46d9-bc2d-cb375fb038e9 X-Archives-Hash: 0c3906f6fe28e0a9b84a8c7e759c5b0c commit: 7cbd04cd62c8f13ed41e07ff8bc9b7e5d5ac700b Author: Zac Medico gentoo org> AuthorDate: Sun Dec 13 06:44:52 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 13 23:37:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7cbd04cd _dep_check_composite_db._visible: verify that highest_visible matches (bug 567686) If the highest visible match for a package slot does not match the required atom, then do not mask other packages in the same slot. Bug 567686 was triggered when the highest visible match for the package slot did not match the subslot specified by the required atom. X-Gentoo-Bug: 567686 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567686 Reported-by: Dennis Schridde gmx.net> Tested-by: Dennis Schridde gmx.net> pym/_emerge/depgraph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2169b00..fd2c771 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -9064,7 +9064,9 @@ class _dep_check_composite_db(dbapi): # Note: highest_visible is not necessarily the real highest # visible, especially when --update is not enabled, so use # < operator instead of !=. - if highest_visible is not None and pkg < highest_visible: + if (highest_visible is not None and pkg < highest_visible + and atom_set.findAtomForPackage(highest_visible, + modified_use=self._depgraph._pkg_use_enabled(highest_visible))): return False elif in_graph != pkg: # Mask choices for packages that would trigger a slot