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 1Q2brT-0000qe-5v for garchives@archives.gentoo.org; Thu, 24 Mar 2011 04:09:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EB0E1C088; Thu, 24 Mar 2011 04:09:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D5CEE1C068 for ; Thu, 24 Mar 2011 04:09:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 400E21BC0D7 for ; Thu, 24 Mar 2011 04:09:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A43F38006A for ; Thu, 24 Mar 2011 04:09:18 +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/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c4b26e6ece564edd30d612628ea5f3c29b5df120 Date: Thu, 24 Mar 2011 04:09:18 +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: X-Archives-Hash: ed47639340a9cfd33b8b95996d62f9cb commit: c4b26e6ece564edd30d612628ea5f3c29b5df120 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 24 04:08:35 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 24 04:08:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc4b26e6e get_dep_chain: handle InvalidDependString --- pym/_emerge/depgraph.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 6de3d14..391c845 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2294,8 +2294,12 @@ class depgraph(object): if target_atom is not None and isinstance(node, Package): affecting_use =3D set() for dep_str in "DEPEND", "RDEPEND", "PDEPEND": - affecting_use.update(extract_affecting_use( - node.metadata[dep_str], target_atom)) + try: + affecting_use.update(extract_affecting_use( + node.metadata[dep_str], target_atom)) + except InvalidDependString: + if not node.installed: + raise affecting_use.difference_update(node.use.mask, node.use.force) pkg_name =3D _unicode_decode("%s") % (node.cpv,) if affecting_use: