Plugins/Packages: ability to overwrite recommended flag per package

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 4b58c0fdb..84ba53840 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -396,10 +396,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")))
@@ -433,11 +438,12 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         base.update(collection.get_essential())
 
         # check for this set of packages in the package cache
-        pkey = hash(tuple(base))
+        pkey = hash((tuple(base), tuple(recommended)))
         if pkey not in self.pkgcache[collection.cachekey]:
             self.pkgcache[collection.cachekey][pkey] = \
-                collection.complete(base)
+                collection.complete(base, recommended)
         packages, unknown = self.pkgcache[collection.cachekey][pkey]
+
         if unknown:
             self.logger.info("Packages: Got %d unknown entries" % len(unknown))
             self.logger.info("Packages: %s" % list(unknown))