diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-24 21:33:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-24 21:33:12 +0000 |
| commit | 22570f366563067cb6fafc683500dc8f57bf5e4d (patch) | |
| tree | 5c8c3f166e0a177496cb8b34ce7338f96ed4de6b | |
| parent | 006ec38511eee165241af56d348c26589dce93ae (diff) | |
| download | portage-22570f366563067cb6fafc683500dc8f57bf5e4d.tar.gz portage-22570f366563067cb6fafc683500dc8f57bf5e4d.tar.bz2 portage-22570f366563067cb6fafc683500dc8f57bf5e4d.zip | |
Fix paren_reduce() so that it appropriately raises an InvalidDependString()
in some cases, instead of a nonsense ValueError.
svn path=/main/trunk/; revision=10393
| -rw-r--r-- | pym/portage/dep.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py index 5f858849b..fa87a7719 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -108,7 +108,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: |