From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Sep 2008 15:16:03 +0000 (-0000)
Subject: Handle InvalidDependString from portdbapi.getFetchMap() inside
X-Git-Tag: v2.2_rc12~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7cc7ecb43807fce5eee6d7e00d41c33a9f1325f8;p=portage.git

Handle InvalidDependString from portdbapi.getFetchMap() inside
search.output(). Thanks to agaffney for reporting.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ac168bd1f..87269a135 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -684,12 +684,18 @@ class search(object):
 						from portage import manifest
 						mf = manifest.Manifest(
 							pkgdir, self.settings["DISTDIR"])
-						fetchlist = self.portdb.getFetchMap(mycpv)
 						try:
-							mysum[0] = mf.getDistfilesSize(fetchlist)
-						except KeyError, e:
-							file_size_str = "Unknown (missing digest for %s)" % \
-								str(e)
+							uri_map = self.portdb.getFetchMap(mycpv)
+						except portage.exception.InvalidDependString, e:
+							file_size_str = "Unknown (%s)" % (e,)
+							del e
+						else:
+							try:
+								mysum[0] = mf.getDistfilesSize(uri_map)
+							except KeyError, e:
+								file_size_str = "Unknown (missing " + \
+									"digest for %s)" % (e,)
+								del e
 
 					available = False
 					for db in self._dbs: