summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-25 10:08:17 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-25 10:08:17 +0000
commit73d256ab01f04bd33131f2d10f0a46758e99391e (patch)
treea66adbb9ba80f6ce24f8e36ce754a6a55b6cd5d3
parent99374c3da3eea930becf2c3c391cb42619bb9bf8 (diff)
downloadportage-73d256ab01f04bd33131f2d10f0a46758e99391e.tar.gz
portage-73d256ab01f04bd33131f2d10f0a46758e99391e.tar.bz2
portage-73d256ab01f04bd33131f2d10f0a46758e99391e.zip
Remove all usage of the portage.archlist global variable.
svn path=/main/trunk/; revision=3232
-rwxr-xr-xbin/repoman4
-rw-r--r--pym/portage.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/repoman b/bin/repoman
index 9429e7c50..129e05720 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -604,7 +604,7 @@ if os.path.exists(descfile):
else:
profiles[arch[0]] = [[arch[1], arch[2]]]
- for x in portage.archlist:
+ for x in repoman_settings.archlist():
if x[0] == "~":
continue
if not profiles.has_key(x):
@@ -1023,7 +1023,7 @@ for x in scanlist:
badlicsyntax = False
badprovsyntax = False
catpkg = catdir+"/"+y
- myiuse = myaux["IUSE"].split() + portage.archlist
+ myiuse = myaux["IUSE"].split() + repoman_settings.archlist()
type_list, badsyntax = [], []
for mytype in ("DEPEND", "RDEPEND", "PDEPEND", "LICENSE", "PROVIDE"):
mydepstr = myaux[mytype]
diff --git a/pym/portage.py b/pym/portage.py
index a302d5238..b493f7e1a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3267,7 +3267,7 @@ def dep_check(depstring,mydbapi,mysettings,use="yes",mode=None,myuse=None,use_ca
#if use=="all":
# mymasks=archlist[:]
#else:
- mymasks=mysettings.usemask+archlist[:]
+ mymasks = mysettings.usemask + mysettings.archlist()
while mysettings["ARCH"] in mymasks:
del mymasks[mymasks.index(mysettings["ARCH"])]
@@ -6862,7 +6862,7 @@ thirdpartymirrors = settings.thirdpartymirrors()
pkglines = settings.packages
groups = settings["ACCEPT_KEYWORDS"].split() # DEPRECATED (no longer used)
-archlist = settings.archlist()
+archlist = settings.archlist() # DEPRECATED (no longer used)
# Clear the cache
dircache={}