diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-14 16:34:25 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-14 07:40:51 -0700 |
| commit | 1b667b6bf20ed8991e198ac686afe6354715846b (patch) | |
| tree | ce2816068f9d2866595c85c13bb713372f032c76 /pym/portage/dep/dep_check.py | |
| parent | 72a32682e1dcbdc7d7394dbc9b166486442b201a (diff) | |
| download | portage-1b667b6bf20ed8991e198ac686afe6354715846b.tar.gz portage-1b667b6bf20ed8991e198ac686afe6354715846b.tar.bz2 portage-1b667b6bf20ed8991e198ac686afe6354715846b.zip | |
portage.dep: Integrate the functionality of dep_opconvert into use_reduce
Diffstat (limited to 'pym/portage/dep/dep_check.py')
| -rw-r--r-- | pym/portage/dep/dep_check.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 28d5771a7..74e14882b 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, \ +from portage.dep import Atom, match_from_list, \ remove_slot, use_reduce from portage.eapi import eapi_has_strong_blocks, eapi_has_use_deps, eapi_has_slot_deps, \ eapi_has_use_dep_defaults @@ -543,13 +543,10 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, useforce.difference_update(mymasks) try: mysplit = use_reduce(depstring, uselist=myusesplit, - masklist=mymasks, matchall=(use=="all"), excludeall=useforce) + masklist=mymasks, matchall=(use=="all"), excludeall=useforce, opconvert=True) except InvalidDependString as e: return [0, str(e)] - # Do the || conversions - mysplit = dep_opconvert(mysplit) - if mysplit == []: #dependencies were reduced to nothing return [1,[]] |