From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 1 May 2007 07:40:41 +0000 (-0000)
Subject:    Merged from trunk 6460:6461
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7c9a84eeae0ffbd2dec65f2ae9195ab5378809e0;p=portage.git

   Merged from trunk 6460:6461

   +------------------------------------------------------------------------+
   | 6461    | Handle KeyError when the ebuild is corrupt.                  |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6463
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index d01b4500b..9347b6e9a 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1677,7 +1677,11 @@ class depgraph:
 										print filename+":"
 										print comment
 										oldcomment = comment
-								licenses = portdb.aux_get(p, ["LICENSE"])[0]
+								try:
+									licenses = portdb.aux_get(p, ["LICENSE"])[0]
+								except KeyError:
+									# Corruption will have been reported above.
+									continue
 								uselist = []
 								if "?" in licenses:
 									pkgsettings.setcpv(p, mydb=portdb)