From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 20 Apr 2007 21:31:53 +0000 (-0000)
Subject: For bug #175344, handle a potential InvalidDependString exception when parsing PROVIDE.
X-Git-Tag: v2.2_pre1~1481
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a981b183da38a3a85ed3e2938b7ce5640e6ef026;p=portage.git

For bug #175344, handle a potential InvalidDependString exception when parsing PROVIDE.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 3a434fb0f..8dbe72b18 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1542,8 +1542,14 @@ class depgraph:
 			if p_status == "merge":
 				# Update old-style virtuals if this package provides any.
 				# These are needed for dep_virtual calls inside dep_check.
-				self.pkgsettings[p_root].setinst(p_key,
-					self.trees[p_root][self.pkg_tree_map[p_type]].dbapi)
+				p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi
+				try:
+					self.pkgsettings[p_root].setinst(p_key, p_db)
+				except portage.exception.InvalidDependString, e:
+					provide = p_db.aux_get(p_key, ["PROVIDE"])[0]
+					show_invalid_depstring_notice(myparent, provide, str(e))
+					del e
+					return 0
 
 		if "--debug" in self.myopts:
 			print "Candidates:",mymerge