Don't catch a ValueError if it isn't the type that's expected
authorZac Medico <zmedico@gentoo.org>
Sun, 21 Oct 2007 20:31:06 +0000 (20:31 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 21 Oct 2007 20:31:06 +0000 (20:31 -0000)
from portage.cpv_expand().

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

pym/_emerge/__init__.py

index 137e4ac7d45e3563b28f34606d58021d21540f2f..2986debaccda06f18e609088c4331b8ace24f439 100644 (file)
@@ -1445,6 +1445,9 @@ class depgraph(object):
                                        jbigkey, depth, DepPriority(runtime_post=True)):
                                        return 0
                except ValueError, e:
+                       if not e.args or not isinstance(e.args[0], list) or \
+                               len(e.args[0]) < 2:
+                               raise
                        pkgs = e.args[0]
                        portage.writemsg("\n\n!!! An atom in the dependencies " + \
                                "is not fully-qualified. Multiple matches:\n\n", noiselevel=-1)