From 99374c3da3eea930becf2c3c391cb42619bb9bf8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 25 Apr 2006 09:36:57 +0000 Subject: Remove all usage of the portage.groups global variable. svn path=/main/trunk/; revision=3231 --- pym/portage.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index 5433289a0..a302d5238 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1283,6 +1283,9 @@ class config: self._init_dirs() + # Repoman may modify this attribute as necessary. + self.groups = self["ACCEPT_KEYWORDS"].split() + def _init_dirs(self): """Create tmp, var/tmp and var/lib/portage (relative to $ROOT).""" @@ -3508,7 +3511,7 @@ def getmaskingstatus(mycpv): if not eapi_is_supported(eapi): return ["required EAPI %s, supported EAPI %s" % (eapi, portage_const.EAPI)] mygroups = mygroups.split() - pgroups=groups[:] + pgroups = settings.groups myarch = settings["ARCH"] pkgdict = settings.pkeywordsdict @@ -5121,7 +5124,7 @@ class portdbapi(dbapi): def gvisible(self,mylist): "strip out group-masked (not in current group) entries" - global db, groups + global db if mylist is None: return [] newlist=[] @@ -5143,7 +5146,8 @@ class portdbapi(dbapi): #print "!!! No KEYWORDS for "+str(mycpv)+" -- Untested Status" continue mygroups=keys.split() - pgroups=groups[:] + # Repoman may modify this attribute as necessary. + pgroups = self.mysettings.groups match=0 cp = dep_getkey(mycpv) if pkgdict.has_key(cp): @@ -6857,7 +6861,7 @@ thirdpartymirrors = settings.thirdpartymirrors() # COMPATABILITY -- This shouldn't be used. pkglines = settings.packages -groups = settings["ACCEPT_KEYWORDS"].split() +groups = settings["ACCEPT_KEYWORDS"].split() # DEPRECATED (no longer used) archlist = settings.archlist() # Clear the cache -- cgit v1.2.3-1-g7c22