diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-13 01:21:10 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-11-22 11:53:33 +0100 |
| commit | 652911f46e6a4aec443e12a2615fde1bf1ba8c31 (patch) | |
| tree | 34db6c43b78049c8cccfdbdbfa31ec2e3bc7eb27 | |
| parent | 412f248fc5a4cfcd4e32d2809c658a29edfaf643 (diff) | |
| download | bcfg2-652911f46e6a4aec443e12a2615fde1bf1ba8c31.tar.gz bcfg2-652911f46e6a4aec443e12a2615fde1bf1ba8c31.tar.bz2 bcfg2-652911f46e6a4aec443e12a2615fde1bf1ba8c31.zip | |
Plugins/Packages/Portage: use keywords/use config everywhere
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Portage.py | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py b/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py index ef486b098..2b0be0c5c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py @@ -64,28 +64,6 @@ class PortageCollection(Collection): if not self.portage: _import_portage(self) - # get global use flags - self.portage.settings.unlock() - self.portage.settings['USE'] = '' - if 'gentoo-use-flags' in self.metadata.Probes: - self.portage.settings['USE'] = \ - self.metadata.Probes['gentoo-use-flags'] - - # add package flags (accept_keywords, use) - if hasattr(self.metadata, 'PkgVars'): - for k in self.metadata.PkgVars['keywords']: - keyword = metadata.PkgVars['keywords'][k] - self.portage.settings._keywords_manager.pkeywordsdict[k] = \ - {k: tuple(keyword)} - - - for u in self.metadata.PkgVars['use']: - use = metadata.PkgVars['use'][u] - self.portage.settings._use_manager._pusedict[u] = \ - {u: tuple(use)} - - self.portage.settings.lock() - # calculate deps setconfig = self.portage._sets.load_default_config( self.portage.settings, @@ -128,7 +106,6 @@ class PortageCollection(Collection): try: name = entry.get('name') - # TODO: handle package specific accept keywords pkgs = self.porttree.dep_bestmatch(name) except self.portage.exception.AmbiguousPackageName as e: self.logger.error("Packages: AmbiguousPackageName: %s" % e) @@ -222,6 +199,7 @@ class PortageCollection(Collection): self.portage = portage self.emerge = emerge self.porttree = porttree + self._set_portage_config() for s in self: if isinstance(s, PortageSource): |