Remove all usage of the portage.archlist global variable.

svn path=/main/trunk/; revision=3232

diff --git a/bin/repoman b/bin/repoman
index 9429e7c50689444ce36cfa4daf3052a2886439db..129e05720b900f3096e2797f773ff76af4dff224 100755 (executable)
--- 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 a302d5238d87b65172e729e724fabf14077dad40..b493f7e1a949a8591674e4feb539abe8eda44d31 100644 (file)
--- 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={}