From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 Jan 2007 20:48:15 +0000 (-0000)
Subject: Raise an informative InvalidData exception instead of 'TypeError: unsubscriptable... 
X-Git-Tag: v2.1.2-r3~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fdc0ee324b049d18dbb689587193dacd5150ca1;p=portage.git

Raise an informative InvalidData exception instead of 'TypeError: unsubscriptable object' when pkgsplit returns None.

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

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index b13569822..bf40452ac 100644
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -607,6 +607,8 @@ def match_from_list(mydep, candidate_list):
 	elif operator == "~": # version, any revision, match
 		for x in candidate_list:
 			xs = catpkgsplit(x)
+			if xs is None:
+				raise InvalidData(x)
 			if not cpvequal(xs[0]+"/"+xs[1]+"-"+xs[2], mycpv_cps[0]+"/"+mycpv_cps[1]+"-"+mycpv_cps[2]):
 				continue
 			if xs[2] != ver: