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 1Rkge0-0007Zn-Iv for garchives@archives.gentoo.org; Tue, 10 Jan 2012 18:42:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D8C221C02F; Tue, 10 Jan 2012 18:41:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DBE4521C02F for ; Tue, 10 Jan 2012 18:41:51 +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 5CB781B402C for ; Tue, 10 Jan 2012 18:41:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8E29680044 for ; Tue, 10 Jan 2012 18:41:50 +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: <5be279c9b406c44b82ffa6015dbdb45263124f84.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5be279c9b406c44b82ffa6015dbdb45263124f84 Date: Tue, 10 Jan 2012 18:41:50 +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: 698c29a0-458d-492c-9acb-d8ee79a2b962 X-Archives-Hash: 6ca3d076283f213f4b2c2dfd0fbf6fb5 commit: 5be279c9b406c44b82ffa6015dbdb45263124f84 Author: Zac Medico gentoo org> AuthorDate: Tue Jan 10 18:41:29 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jan 10 18:41:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5be279c9 ExtendedAtomDict: fix for python-trace --- pym/portage/dep/__init__.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 154b8a2..72411b7 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1376,10 +1376,13 @@ class ExtendedAtomDict(portage.cache.mappings.Mut= ableMapping): yield k =20 def iteritems(self): - for item in self._normal.items(): - yield item - for item in self._extended.items(): - yield item + try: + for item in self._normal.items(): + yield item + for item in self._extended.items(): + yield item + except AttributeError: + pass # FEATURES=3Dpython-trace =20 def __delitem__(self, cp): if "*" in cp: