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 1Pp0Nd-0003NZ-Bm for garchives@archives.gentoo.org; Mon, 14 Feb 2011 15:30:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20893E0B48; Mon, 14 Feb 2011 15:30:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E1A51E0B48 for ; Mon, 14 Feb 2011 15:30:17 +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 56DAE1B4105 for ; Mon, 14 Feb 2011 15:30:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B997B8006A for ; Mon, 14 Feb 2011 15:30:16 +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: <2f2846acd57c549f14a2084fdd59628a35b15601.zmedico@gentoo> 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: 2f2846acd57c549f14a2084fdd59628a35b15601 Date: Mon, 14 Feb 2011 15:30:16 +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: 524955bf48ea4fa06fd5a33def93b07c commit: 2f2846acd57c549f14a2084fdd59628a35b15601 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 15:29:33 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 15:29:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2f2846ac depgraph: fix KeyError in select_atoms This happens if depstring evaluates to nothing. --- pym/_emerge/depgraph.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9633874..cacc8cc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2219,6 +2219,8 @@ class depgraph(object): raise portage.exception.InvalidDependString(mycheck[1]) if parent is None: selected_atoms =3D mycheck[1] + elif parent not in atom_graph: + selected_atoms =3D {parent : mycheck[1]} else: # Recursively traversed virtual dependencies, and their # direct dependencies, are considered to have the same