From fb43a0ac59f5d878a455015ddbf24957263269e1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 9 Dec 2006 19:19:16 +0000 Subject: Add use.force support to dep_check for repoman especially. Thanks to Flameeyes for reporting and tesing. svn path=/main/trunk/; revision=5239 --- pym/portage.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/portage.py b/pym/portage.py index ce1072f78..cb8463b2d 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3884,6 +3884,7 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, if mysettings: mymasks = set() + useforce = set([mysettings["ARCH"]]) if use == "all": # These masks are only for repoman. In other cases, relevant masks # should have already been applied via config.regenerate(). Also, @@ -3895,7 +3896,10 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, mymasks.update(mysettings.usemask) mymasks.update(mysettings.archlist()) mymasks.discard(mysettings["ARCH"]) - mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,masklist=mymasks,matchall=(use=="all"),excludeall=[mysettings["ARCH"]]) + useforce.update(mysettings.useforce) + useforce.difference_update(mymasks) + mysplit = portage_dep.use_reduce(mysplit, uselist=myusesplit, + masklist=mymasks, matchall=(use=="all"), excludeall=useforce) else: mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,matchall=(use=="all")) -- cgit v1.2.3-1-g7c22