diff options
author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-10 21:09:09 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-10 22:28:57 -0700 |
commit | 047f52b5d439573cc673a189096ba33c1817b882 (patch) | |
tree | 799ffd1c26b3e4e4b15a7a668f81ec479af5f0e7 /pym/portage/dep/dep_check.py | |
parent | 2fe8c1c1aecc38079321cbe8bcdc75da31dbacc8 (diff) | |
download | portage-047f52b5d439573cc673a189096ba33c1817b882.tar.gz portage-047f52b5d439573cc673a189096ba33c1817b882.tar.bz2 portage-047f52b5d439573cc673a189096ba33c1817b882.zip |
portage.dep.use_reduce: Work on depstrings instead of paren_reduce'd dep arrays
This change makes paren_reduce and paren_normalize calls for use_reduce redundant,
resp. wrong. All consumers inside portage are adopted.
Diffstat (limited to 'pym/portage/dep/dep_check.py')
-rw-r--r-- | pym/portage/dep/dep_check.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 8747bb148..dd6864227 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -6,7 +6,7 @@ __all__ = ['dep_check', 'dep_eval', 'dep_wordreduce', 'dep_zapdeps'] import logging import portage -from portage.dep import Atom, dep_opconvert, match_from_list, paren_reduce, \ +from portage.dep import Atom, dep_opconvert, match_from_list, \ remove_slot, use_reduce from portage.exception import InvalidAtom, InvalidDependString, ParseError from portage.localization import _ @@ -521,12 +521,6 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, # WE ALSO CANNOT USE SETTINGS myusesplit=[] - #convert parenthesis to sublists - try: - mysplit = paren_reduce(depstring) - except InvalidDependString as e: - return [0, str(e)] - mymasks = set() useforce = set() useforce.add(mysettings["ARCH"]) @@ -544,7 +538,7 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, useforce.update(mysettings.useforce) useforce.difference_update(mymasks) try: - mysplit = use_reduce(mysplit, uselist=myusesplit, + mysplit = use_reduce(depstring, uselist=myusesplit, masklist=mymasks, matchall=(use=="all"), excludeall=useforce) except InvalidDependString as e: return [0, str(e)] |