diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-04 20:56:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-04 20:56:58 +0000 |
| commit | b616d9ce842fcda526d1c5cc07f61f2a888058ea (patch) | |
| tree | cc26074dac2b74bc0588a9924b2f6cf7fc75408c /pym | |
| parent | 47164587531641e8bcfbbfe59c7550de89ac2e55 (diff) | |
| download | portage-b616d9ce842fcda526d1c5cc07f61f2a888058ea.tar.gz portage-b616d9ce842fcda526d1c5cc07f61f2a888058ea.tar.bz2 portage-b616d9ce842fcda526d1c5cc07f61f2a888058ea.zip | |
Use a set for masklist inside dep_check.
svn path=/main/trunk/; revision=4404
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pym/portage.py b/pym/portage.py index aba4c224c..600c9cd71 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3450,16 +3450,11 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, mysplit = portage_dep.paren_reduce(depstring) if mysettings: - # XXX: use="all" is only used by repoman. Why would repoman checks want - # profile-masked USE flags to be enabled? - #if use=="all": - # mymasks=archlist[:] - #else: - mymasks = mysettings.usemask + list(mysettings.pusemask) + \ - mysettings.archlist() - - while mysettings["ARCH"] in mymasks: - del mymasks[mymasks.index(mysettings["ARCH"])] + mymasks = set() + mymasks.update(mysettings.usemask) + mymasks.update(mysettings.pusemask) + mymasks.update(mysettings.archlist()) + mymasks.discard(mysettings["ARCH"]) mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,masklist=mymasks,matchall=(use=="all"),excludeall=[mysettings["ARCH"]]) else: mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,matchall=(use=="all")) |