summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-21 20:31:06 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-21 20:31:06 +0000
commit72d2b24829d5e52a634782dd7bfbb2c8d0dc74b8 (patch)
tree9057792e46cb7c00a2a0822f229761a0b25cf3e5
parent2e4f9fca17a3b0f76188bed4ad9b9864e8ef67f9 (diff)
downloadportage-72d2b24829d5e52a634782dd7bfbb2c8d0dc74b8.tar.gz
portage-72d2b24829d5e52a634782dd7bfbb2c8d0dc74b8.tar.bz2
portage-72d2b24829d5e52a634782dd7bfbb2c8d0dc74b8.zip
Don't catch a ValueError if it isn't the type that's expected
from portage.cpv_expand(). svn path=/main/trunk/; revision=8218
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 3 insertions, 0 deletions
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)