Remove portage.config.groups (formerly portage.groups) and instead use ACCEPT_KEYWORD...

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

diff --git a/bin/repoman b/bin/repoman
index f7f542a2d720664d5d01dc234ca2515114c7791f..4735d6875275f3a0f5c1ef88dc11aae39b9d3d3e 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1007,7 +1007,7 @@ for x in scanlist:
                
                if "--ignore-arches" in myoptions:
                        arches = [[repoman_settings["ARCH"], repoman_settings["ARCH"],
-                               repoman_settings.groups]]
+                               repoman_settings["ACCEPT_KEYWORDS"].split()]]
                else:
                        arches=[]
                        for keyword in myaux["KEYWORDS"].split():
@@ -1095,9 +1095,8 @@ for x in scanlist:
                                if arch_caches.has_key(prof[0]):
                                        dep_settings, portage.portdb, portage.db["/"]["porttree"] = arch_caches[prof[0]]
                                else:
-                                       os.environ["ACCEPT_KEYWORDS"]="-~"+arch
                                        dep_settings=portage.config(config_profile_path=profdir, config_incrementals=portage_const.INCREMENTALS)
-                                       dep_settings.groups = groups
+                                       dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups)
                                        portage.portdb=portage.portdbapi(portdir, dep_settings)
                                        portage.db["/"]["porttree"]=portage.portagetree("/",dep_settings.getvirtuals("/"))
                                        arch_caches[prof[0]]=[dep_settings, portage.portdb, portage.db["/"]["porttree"]]

diff --git a/pym/portage.py b/pym/portage.py
index c393a321611719511c99904ad8f4da9b33d82ad8..879ec21d9b8fa9a7dfcedf066458e67555d47f49 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1282,9 +1282,6 @@ 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)."""
 
@@ -3512,7 +3509,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 = settings.groups[:] # Make a local copy so we can modify it.
+       pgroups = settings["ACCEPT_KEYWORDS"].split()
        myarch = settings["ARCH"]
        pkgdict = settings.pkeywordsdict
 
@@ -5155,7 +5152,7 @@ class portdbapi(dbapi):
                                continue
                        mygroups=keys.split()
                        # Repoman may modify this attribute as necessary.
-                       pgroups = self.mysettings.groups[:] # Make a local copy so we can modify it.
+                       pgroups = self.mysettings["ACCEPT_KEYWORDS"].split()
                        match=0
                        cp = dep_getkey(mycpv)
                        if pkgdict.has_key(cp):