Raise an informative InvalidData exception instead of 'TypeError: unsubscriptable...

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

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index b13569822295691624234b31a5ff83cf5112c345..bf40452ac6c5158a54361e56fa198cd96c4430b9 100644 (file)
--- 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: