diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-04-26 03:36:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-26 03:36:42 +0000 |
| commit | 709773726b6f2327c9dffa674988f5e0122d624a (patch) | |
| tree | e8efffe341c696ca2f5601d04be6c8d5417fa7ec | |
| parent | 20b180b8c91aa493780174ba56b3504f63819826 (diff) | |
| download | portage-709773726b6f2327c9dffa674988f5e0122d624a.tar.gz portage-709773726b6f2327c9dffa674988f5e0122d624a.tar.bz2 portage-709773726b6f2327c9dffa674988f5e0122d624a.zip | |
Remove portage.config.groups (formerly portage.groups) and instead use ACCEPT_KEYWORDS directly (simplifies the code).
svn path=/main/trunk/; revision=3238
| -rwxr-xr-x | bin/repoman | 5 | ||||
| -rw-r--r-- | pym/portage.py | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/bin/repoman b/bin/repoman index f7f542a2d..4735d6875 100755 --- 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 c393a3216..879ec21d9 100644 --- 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): |