diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-10 23:08:54 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:56:35 +0100 |
| commit | 0b9e5aba02c7cda1b1e6a0ed506fdd178aa1b365 (patch) | |
| tree | 398071177fc1ca6da6bfaadff0c4082e2700d7e5 | |
| parent | 39decd7040b09746a6c2ab74db73b21e9db25662 (diff) | |
| download | bcfg2-0b9e5aba02c7cda1b1e6a0ed506fdd178aa1b365.tar.gz bcfg2-0b9e5aba02c7cda1b1e6a0ed506fdd178aa1b365.tar.bz2 bcfg2-0b9e5aba02c7cda1b1e6a0ed506fdd178aa1b365.zip | |
Plugins/Packages/Portage: add support for per-package flags
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Portage.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py b/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py index e9e787734..a74bf5e4a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Portage.py @@ -62,15 +62,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'] - self.portage.settings.lock() - - # calculate deps setconfig = self.portage._sets.load_default_config( self.portage.settings, @@ -112,7 +103,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) @@ -183,7 +173,7 @@ class PortageCollection(Collection): for k in self.metadata.PkgVars['keywords']: keyword = self.metadata.PkgVars['keywords'][k] self.portage.settings._keywords_manager.pkeywordsdict[k] = \ - {k: tuple(keyword)} + {self.portage.dep.Atom(k): tuple(keyword)} for u in self.metadata.PkgVars['use']: @@ -197,6 +187,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): |