summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-04 18:42:35 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-04 18:42:35 +0000
commit7f951ed98e13a915163c3dd21ef6fc6c66f9640e (patch)
tree9e9ca274d7ea579210b56b12c194a4c364bbd4ae
parent3c6f06a5737438aae4698deb604056b8c1e93aa5 (diff)
downloadportage-7f951ed98e13a915163c3dd21ef6fc6c66f9640e.tar.gz
portage-7f951ed98e13a915163c3dd21ef6fc6c66f9640e.tar.bz2
portage-7f951ed98e13a915163c3dd21ef6fc6c66f9640e.zip
Add repoman support for package.use.mask.
svn path=/main/trunk/; revision=4401
-rwxr-xr-xbin/repoman2
-rw-r--r--pym/portage.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 44e3e2e81..9b052ff12 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1158,7 +1158,7 @@ for x in scanlist:
if prof[1] == "dev":
suffix=suffix+"indev"
-
+ dep_settings.setcpv("/".join((catdir, y)))
for mytype,mypos in [["DEPEND",len(missingvars)],["RDEPEND",len(missingvars)+1],["PDEPEND",len(missingvars)+2]]:
mykey=mytype+".bad"+suffix
diff --git a/pym/portage.py b/pym/portage.py
index 5c450d3e2..aba4c224c 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3455,7 +3455,8 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None,
#if use=="all":
# mymasks=archlist[:]
#else:
- mymasks = mysettings.usemask + mysettings.archlist()
+ mymasks = mysettings.usemask + list(mysettings.pusemask) + \
+ mysettings.archlist()
while mysettings["ARCH"] in mymasks:
del mymasks[mymasks.index(mysettings["ARCH"])]