From 19286824f424f5945790d6a58dd719531e0173bd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 25 May 2008 04:23:16 +0000 Subject: Fix paren_reduce() so that it appropriately raises an InvalidDependString() in some cases, instead of a nonsense ValueError. (trunk r10393) svn path=/main/branches/2.1.2/; revision=10409 --- pym/portage_dep.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/portage_dep.py b/pym/portage_dep.py index 9ad8421c9..41c2c54ff 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -89,7 +89,11 @@ def paren_reduce(mystr,tokenize=1): "missing right parenthesis: '%s'" % mystr) elif has_left_paren and left_paren < right_paren: freesec,subsec = mystr.split("(",1) - subsec,tail = paren_reduce(subsec,tokenize) + sublist = paren_reduce(subsec, tokenize=tokenize) + if len(sublist) != 2: + raise portage_exception.InvalidDependString( + "malformed syntax: '%s'" % mystr) + subsec, tail = sublist else: subsec,tail = mystr.split(")",1) if tokenize: -- cgit v1.2.3-1-g7c22