diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:23:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:23:16 +0000 |
| commit | 19286824f424f5945790d6a58dd719531e0173bd (patch) | |
| tree | 7f3ebfdef6a9766bf12e92302c28c35eaf2947b7 /pym/portage_dep.py | |
| parent | e3ceb03672cc394df3de50c7ee81f7213b76c9c8 (diff) | |
| download | portage-19286824f424f5945790d6a58dd719531e0173bd.tar.gz portage-19286824f424f5945790d6a58dd719531e0173bd.tar.bz2 portage-19286824f424f5945790d6a58dd719531e0173bd.zip | |
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
Diffstat (limited to 'pym/portage_dep.py')
| -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 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: |