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 00009138010 for ; Thu, 18 Oct 2012 00:12:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0374E0158; Thu, 18 Oct 2012 00:11:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 563A7E0158 for ; Thu, 18 Oct 2012 00:11:50 +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 B353F33C770 for ; Thu, 18 Oct 2012 00:11:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5C921E5436 for ; Thu, 18 Oct 2012 00:11:48 +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: <1350519097.8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/create_world_atom.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7 X-VCS-Branch: master Date: Thu, 18 Oct 2012 00:11:48 +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: 1cf13ec0-4262-4209-b5a5-7b095c8d1247 X-Archives-Hash: cc220990a6129b1d5bd29dec76c221ad commit: 8bf4b16ee1e3d5ecf58ce20f19563947bfa917d7 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 18 00:11:37 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 18 00:11:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8bf4b16e create_world_atom: account for EAPI 5 sub-slot --- pym/_emerge/create_world_atom.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/create_world_atom.py b/pym/_emerge/create_world_atom.py index 35fb7c4..3e05c6d 100644 --- a/pym/_emerge/create_world_atom.py +++ b/pym/_emerge/create_world_atom.py @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage.dep import _repo_separator @@ -35,8 +35,7 @@ def create_world_atom(pkg, args_set, root_config): for cpv in portdb.match(cp): for repo in repos: try: - available_slots.add(portdb.aux_get(cpv, ["SLOT"], - myrepo=repo)[0]) + available_slots.add(portdb._pkg_str(cpv, repo).slot) except KeyError: pass @@ -44,7 +43,7 @@ def create_world_atom(pkg, args_set, root_config): (len(available_slots) == 1 and "0" not in available_slots) if not slotted: # check the vdb in case this is multislot - available_slots = set(vardb.aux_get(cpv, ["SLOT"])[0] \ + available_slots = set(vardb._pkg_str(cpv, None).slot \ for cpv in vardb.match(cp)) slotted = len(available_slots) > 1 or \ (len(available_slots) == 1 and "0" not in available_slots) @@ -83,13 +82,12 @@ def create_world_atom(pkg, args_set, root_config): matched_slots = set() if mydb is vardb: for cpv in matches: - matched_slots.add(mydb.aux_get(cpv, ["SLOT"])[0]) + matched_slots.add(mydb._pkg_str(cpv, None).slot) else: for cpv in matches: for repo in repos: try: - matched_slots.add(portdb.aux_get(cpv, ["SLOT"], - myrepo=repo)[0]) + matched_slots.add(portdb._pkg_str(cpv, repo).slot) except KeyError: pass