From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 7 Feb 2007 21:47:43 +0000 (-0000)
Subject: For bug #165783, handle a potential InvalidDependString exception inside digestgen().
X-Git-Tag: v2.2_pre1~1739
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=baf2d12c790630f9e9f74fef08aba887a7fe0a00;p=portage.git

For bug #165783, handle a potential InvalidDependString exception inside digestgen().

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ff780c582..5ba744660 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2697,9 +2697,15 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
 		_doebuild_manifest_exempt_depend += 1
 		distfiles_map = {}
 		fetchlist_dict = FetchlistDict(mysettings["O"], mysettings, myportdb)
-		for cpv, fetchlist in fetchlist_dict.iteritems():
-			for myfile in fetchlist:
-				distfiles_map.setdefault(myfile, []).append(cpv)
+		for cpv in fetchlist_dict:
+			try:
+				for myfile in fetchlist_dict[cpv]:
+					distfiles_map.setdefault(myfile, []).append(cpv)
+			except portage_exception.InvalidDependString, e:
+				writemsg("!!! %s\n" % str(e), noiselevel=-1)
+				writemsg("!!! Invalid SRC_URI for '%s'.\n" % cpv, noiselevel=-1)
+				del e
+				return 0
 		mf = Manifest(mysettings["O"], mysettings["DISTDIR"],
 			fetchlist_dict=fetchlist_dict)
 		# Don't require all hashes since that can trigger excessive