diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-05-17 11:01:17 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-05-17 11:01:17 -0500 |
| commit | a03eb5cc5699e44de5fdb6ba6f5e69f3e5cee09a (patch) | |
| tree | d5ad54cbfb772c65ea1eada8477bfe0896f68472 /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | c552826ef8d1f8e81678104975a6e7de469ec42e (diff) | |
| parent | 7997ae385a997c3c73bc018a6193fb77362ce4b5 (diff) | |
| download | bcfg2-a03eb5cc5699e44de5fdb6ba6f5e69f3e5cee09a.tar.gz bcfg2-a03eb5cc5699e44de5fdb6ba6f5e69f3e5cee09a.tar.bz2 bcfg2-a03eb5cc5699e44de5fdb6ba6f5e69f3e5cee09a.zip | |
Merge branch 'recommended-per-package' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 49f64bdf3..59cd3aafe 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -357,10 +357,15 @@ class Packages(Bcfg2.Server.Plugin.Plugin, initial = set() to_remove = [] groups = [] + recommended = dict() + for struct in structures: for pkg in struct.xpath('//Package | //BoundPackage'): if pkg.get("name"): initial.update(collection.packages_from_entry(pkg)) + + if pkg.get("recommended"): + recommended[pkg.get("name")] = pkg.get("recommended") elif pkg.get("group"): groups.append((pkg.get("group"), pkg.get("type"))) @@ -399,7 +404,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, pcache = Bcfg2.Server.Cache.Cache("Packages", "pkg_sets", collection.cachekey) if pkey not in pcache: - pcache[pkey] = collection.complete(base) + pcache[pkey] = collection.complete(base, recommended) packages, unknown = pcache[pkey] if unknown: self.logger.info("Packages: Got %d unknown entries" % len(unknown)) |