From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 21 Oct 2007 20:31:06 +0000 (-0000)
Subject: Don't catch a ValueError if it isn't the type that's expected
X-Git-Tag: v2.2_pre1~564
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72d2b24829d5e52a634782dd7bfbb2c8d0dc74b8;p=portage.git

Don't catch a ValueError if it isn't the type that's expected
from portage.cpv_expand().

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 137e4ac7d..2986debac 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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)