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

For bug #175344, handle a potential InvalidDependString exception when parsing PROVIDE. (trunk r6420:6421)

svn path=/main/branches/2.1.2/; revision=6422
---

diff --git a/bin/repoman b/bin/repoman
index 1e2f54864..3eef5c29d 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -999,8 +999,14 @@ for x in scanlist:
 		#for x in myaux[allvars.index("RESTRICT")].split():
 		#	if x.startswith("no"):
 		#		print "Bad RESTRICT value: %s" % x
-
-		myaux["PROVIDE"] = portage_dep.use_reduce(portage_dep.paren_reduce(myaux["PROVIDE"]), matchall=1)
+		try:
+			myaux["PROVIDE"] = portage_dep.use_reduce(
+				portage_dep.paren_reduce(myaux["PROVIDE"]), matchall=1)
+		except portage_exception.InvalidDependString, e:
+			stats["PROVIDE.syntax"] = stats["PROVIDE.syntax"] + 1
+			fails["PROVIDE.syntax"].append(mykey+".ebuild PROVIDE: "+str(e))
+			del e
+			continue
 		myaux["PROVIDE"] = " ".join(portage.flatten(myaux["PROVIDE"]))
 		for myprovide in myaux["PROVIDE"].split():
 			prov_cp = portage.dep_getkey(myprovide)