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 1RmUNO-0000Z1-EF for garchives@archives.gentoo.org; Sun, 15 Jan 2012 18:00:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B6DBE077F; Sun, 15 Jan 2012 18:00:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4E359E077F for ; Sun, 15 Jan 2012 18:00:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 950CB1B4009 for ; Sun, 15 Jan 2012 18:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B9AD580042 for ; Sun, 15 Jan 2012 18:00:08 +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: 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: fb6020862e1b609f3006584d018221312bfbe581 Date: Sun, 15 Jan 2012 18:00:08 +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: be82bc5f-825e-409f-8e4c-eea1f47e8e93 X-Archives-Hash: 5e7ed97c331b88e0be14b2946ac38c3a commit: fb6020862e1b609f3006584d018221312bfbe581 Author: Zac Medico gentoo org> AuthorDate: Sun Jan 15 17:59:37 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jan 15 18:00:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfb602086 create_world_atom: multi-repo portdbapi aux_get This handles a KeyError raised from portdbapi.aux_get() when one of the repositories has a corrupt ebuild. --- pym/_emerge/create_world_atom.py | 35 +++++++++++++++++++++++++++++++-= --- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/create_world_atom.py b/pym/_emerge/create_world_= atom.py index fa7cffc..35fb7c4 100644 --- a/pym/_emerge/create_world_atom.py +++ b/pym/_emerge/create_world_atom.py @@ -21,8 +21,25 @@ def create_world_atom(pkg, args_set, root_config): sets =3D root_config.sets portdb =3D root_config.trees["porttree"].dbapi vardb =3D root_config.trees["vartree"].dbapi - available_slots =3D set(portdb.aux_get(cpv, ["SLOT"])[0] \ - for cpv in portdb.match(cp)) + + if arg_atom.repo is not None: + repos =3D [arg_atom.repo] + else: + # Iterate over portdbapi.porttrees, since it's common to + # tweak this attribute in order to adjust match behavior. + repos =3D [] + for tree in portdb.porttrees: + repos.append(portdb.repositories.get_name_for_location(tree)) + + available_slots =3D set() + for cpv in portdb.match(cp): + for repo in repos: + try: + available_slots.add(portdb.aux_get(cpv, ["SLOT"], + myrepo=3Drepo)[0]) + except KeyError: + pass + slotted =3D len(available_slots) > 1 or \ (len(available_slots) =3D=3D 1 and "0" not in available_slots) if not slotted: @@ -64,8 +81,18 @@ def create_world_atom(pkg, args_set, root_config): # enough to identify a specific slot. matches =3D mydb.match(arg_atom) matched_slots =3D set() - for cpv in matches: - matched_slots.add(mydb.aux_get(cpv, ["SLOT"])[0]) + if mydb is vardb: + for cpv in matches: + matched_slots.add(mydb.aux_get(cpv, ["SLOT"])[0]) + else: + for cpv in matches: + for repo in repos: + try: + matched_slots.add(portdb.aux_get(cpv, ["SLOT"], + myrepo=3Drepo)[0]) + except KeyError: + pass + if len(matched_slots) =3D=3D 1: new_world_atom =3D slot_atom if arg_atom.repo: