From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-72452-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1K6MiC-0001eT-1x
	for garchives@archives.gentoo.org; Wed, 11 Jun 2008 09:33:48 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 30228E0484;
	Wed, 11 Jun 2008 09:33:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0CFDEE0484
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jun 2008 09:33:47 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id A07B264A5E
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jun 2008 09:33:46 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1K6Mi6-0001IS-Jj
	for gentoo-commits@lists.gentoo.org; Wed, 11 Jun 2008 09:33:42 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r10648 - main/trunk/pym/_emerge
X-VCS-Repository: portage
X-VCS-Revision: 10648
X-VCS-Files: main/trunk/pym/_emerge/__init__.py
X-VCS-Directories: main/trunk/pym/_emerge
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1K6Mi6-0001IS-Jj@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Wed, 11 Jun 2008 09:33:42 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 1db34d55-32e1-4dce-b555-76f9fd001047
X-Archives-Hash: 832385c98d6c8ef5ecb199d68333bdd5

Author: zmedico
Date: 2008-06-11 09:33:41 +0000 (Wed, 11 Jun 2008)
New Revision: 10648

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Handle InvalidDependString in _package_cache.__setitem__().


Modified: main/trunk/pym/_emerge/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/pym/_emerge/__init__.py	2008-06-11 09:20:51 UTC (rev 10647=
)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-11 09:33:41 UTC (rev 10648=
)
@@ -5655,10 +5655,13 @@
 		def __setitem__(self, k, v):
 			dict.__setitem__(self, k, v)
 			root_config =3D self._depgraph.roots[v.root]
-			if visible(root_config.settings, v) and \
-				not (v.installed and \
-				v.root_config.settings.getMissingKeywords(v.cpv, v.metadata)):
-				root_config.visible_pkgs.cpv_inject(v)
+			try:
+				if visible(root_config.settings, v) and \
+					not (v.installed and \
+					v.root_config.settings.getMissingKeywords(v.cpv, v.metadata)):
+					root_config.visible_pkgs.cpv_inject(v)
+			except portage.exception.InvalidDependString:
+				pass
=20
 class RepoDisplay(object):
 	def __init__(self, roots):

--=20
gentoo-commits@lists.gentoo.org mailing list