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 976D1138010 for ; Fri, 26 Oct 2012 17:13:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 220A021C00E; Fri, 26 Oct 2012 17:13:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A031921C00E for ; Fri, 26 Oct 2012 17:13:48 +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 03C3F33D935 for ; Fri, 26 Oct 2012 17:13:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8AEEDE5436 for ; Fri, 26 Oct 2012 17:13:46 +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: <1351271596.3fcf296fdda7fa3f7c36d4d4c3ab55156fcd70fa.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: 3fcf296fdda7fa3f7c36d4d4c3ab55156fcd70fa X-VCS-Branch: master Date: Fri, 26 Oct 2012 17:13:46 +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: 6f3c20f3-84e8-4075-8ccc-354afd2ac09d X-Archives-Hash: c9fb15a3a1170c51bbd0f8456a2c8461 commit: 3fcf296fdda7fa3f7c36d4d4c3ab55156fcd70fa Author: Zac Medico gentoo org> AuthorDate: Fri Oct 26 17:13:16 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 26 17:13:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3fcf296f depgraph: use _match_slot in multislot match This amkes sub-slot matching work correctly. --- pym/_emerge/depgraph.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index fd5dfe8..952d061 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3853,8 +3853,8 @@ class depgraph(object): for other_db, other_type, other_built, \ other_installed, other_keys in dbs: try: - if atom.slot == \ - other_db._pkg_str(_unicode(cpv), None).slot: + if portage.dep._match_slot(atom, + other_db._pkg_str(_unicode(cpv), None)): slot_available = True break except (KeyError, InvalidData):