From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Mar 2007 21:58:46 +0000 (-0000)
Subject: Catch a potential InvalidDependString exception.
X-Git-Tag: v2.2_pre1~1556
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29293eb0409e57b0bfff24c681d03f9cf922332a;p=portage.git

Catch a potential InvalidDependString exception.

svn path=/main/trunk/; revision=6258
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 5b38f95af..bd700ff92 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1694,8 +1694,14 @@ class depgraph:
 										oldcomment = comment
 								licenses = portdb.aux_get(p, ["LICENSE"])[0]
 								missing_licenses = []
-								for l in pkgsettings.getMissingLicenses(
-									licenses, p):
+								try:
+									missing_licenses = \
+									pkgsettings.getMissingLicenses(licenses, p)
+								except portage.exception.InvalidDependString:
+									# This will have already been reported
+									# above via mreasons.
+									pass
+								for l in missing_licenses:
 									l_path = portdb.findLicensePath(l)
 									if l in shown_licenses:
 										continue