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 1RRGo6-0004aa-5E for garchives@archives.gentoo.org; Fri, 18 Nov 2011 05:16:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29BE821C02D; Fri, 18 Nov 2011 05:16:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E959021C02D for ; Fri, 18 Nov 2011 05:16:02 +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 43B1B1B4039 for ; Fri, 18 Nov 2011 05:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9D00680042 for ; Fri, 18 Nov 2011 05:16:01 +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/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fcb918d19bfd96dbafcacb67d54977aa9e471013 Date: Fri, 18 Nov 2011 05:16:01 +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: 120b0715-020c-4a32-b253-42bb29eec38e X-Archives-Hash: 1e5e03d34548e50f271bc5540ef66a45 commit: fcb918d19bfd96dbafcacb67d54977aa9e471013 Author: Zac Medico gentoo org> AuthorDate: Fri Nov 18 05:15:53 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Nov 18 05:15:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfcb918d1 config: tweak mapping implementation more --- pym/portage/package/ebuild/config.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index b722a21..835cd23 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2094,8 +2094,10 @@ class config(object): return portage._pym_path =20 for d in self.lookuplist: - if mykey in d: + try: return d[mykey] + except KeyError: + pass =20 raise KeyError(mykey) =20 @@ -2153,7 +2155,7 @@ class config(object): =20 def iteritems(self): for k in self: - yield (k, self[k]) + yield (k, self._getitem(k)) =20 def items(self): return list(self.iteritems())