summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-09 19:19:16 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-09 19:19:16 +0000
commitfb43a0ac59f5d878a455015ddbf24957263269e1 (patch)
treedadb9c9b3194ef0aae0ddbed7a3641f0af639710
parentf0a2016359cc38b0b658c0ef08120a52a196eb0f (diff)
downloadportage-fb43a0ac59f5d878a455015ddbf24957263269e1.tar.gz
portage-fb43a0ac59f5d878a455015ddbf24957263269e1.tar.bz2
portage-fb43a0ac59f5d878a455015ddbf24957263269e1.zip
Add use.force support to dep_check for repoman especially. Thanks to Flameeyes for reporting and tesing.
svn path=/main/trunk/; revision=5239
-rw-r--r--pym/portage.py6
1 files changed, 5 insertions, 1 deletions
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"))