Plugins/Packages: ability to overwrite recommended flag per package

1 files changed, 35 insertions, 7 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 4b6130f72..eadc4e075 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -246,6 +246,10 @@ class Source(Debuggable):  # pylint: disable=R0902
         #: :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection`
         self.provides = dict()
 
+        #: A dict of ``<package name>`` -> ``<list of recommended
+        #: symbols>``.  This will not necessarily be populated.
+        self.recommends = dict()
+
         #: The file (or directory) used for this source's cache data
         self.cachefile = os.path.join(self.basepath,
                                       "cache-%s" % self.cachekey)
@@ -310,7 +314,7 @@ class Source(Debuggable):  # pylint: disable=R0902
         :raises: cPickle.UnpicklingError - If the saved data is corrupt """
         data = open(self.cachefile, 'rb')
         (self.pkgnames, self.deps, self.provides,
-         self.essentialpkgs) = cPickle.load(data)
+         self.essentialpkgs, self.recommends) = cPickle.load(data)
 
     def save_state(self):
         """ Save state to :attr:`cachefile`.  If caching and
@@ -318,7 +322,7 @@ class Source(Debuggable):  # pylint: disable=R0902
         does not need to be implemented. """
         cache = open(self.cachefile, 'wb')
         cPickle.dump((self.pkgnames, self.deps, self.provides,
-                      self.essentialpkgs), cache, 2)
+                      self.essentialpkgs, self.recommends), cache, 2)
         cache.close()
 
     @track_statistics()
@@ -513,13 +517,13 @@ class Source(Debuggable):  # pylint: disable=R0902
         as its final step."""
         pass
 
-    def process_files(self, dependencies, provides):
+    def process_files(self, dependencies, provides, recommends=dict()):
         """ Given dicts of depends and provides generated by
         :func:`read_files`, this generates :attr:`deps` and
         :attr:`provides` and calls :func:`save_state` to save the
         cached data to disk.
 
-        Both arguments are dicts of dicts of lists.  Keys are the
+        All arguments are dicts of dicts of lists.  Keys are the
         arches of packages contained in this source; values are dicts
         whose keys are package names and values are lists of either
         dependencies for each package the symbols provided by each
@@ -531,14 +535,20 @@ class Source(Debuggable):  # pylint: disable=R0902
         :param provides: A dict of symbols provided by packages in
                         this repository.
         :type provides: dict; see above.
+        :param recommends: A dict of recommended dependencies
+                           found for this source.
+        :type recommends: dict; see above.
         """
         self.deps['global'] = dict()
+        self.recommends['global'] = dict()
         self.provides['global'] = dict()
         for barch in dependencies:
             self.deps[barch] = dict()
+            self.recommends[barch] = dict()
             self.provides[barch] = dict()
         for pkgname in self.pkgnames:
             pset = set()
+            rset = set()
             for barch in dependencies:
                 if pkgname not in dependencies[barch]:
                     dependencies[barch][pkgname] = []
@@ -548,6 +558,17 @@ class Source(Debuggable):  # pylint: disable=R0902
             else:
                 for barch in dependencies:
                     self.deps[barch][pkgname] = dependencies[barch][pkgname]
+
+            for barch in recommends:
+                if pkgname not in recommends[barch]:
+                    recommends[barch][pkgname] = []
+                rset.add(tuple(recommends[barch][pkgname]))
+            if len(rset) == 1:
+                self.recommends['global'][pkgname] = rset.pop()
+            else:
+                for barch in recommends:
+                    self.recommends[barch][pkgname] = recommends[barch][pkgname]
+
         provided = set()
         for bprovided in list(provides.values()):
             provided.update(set(bprovided))
@@ -655,17 +676,24 @@ class Source(Debuggable):  # pylint: disable=R0902
         """
         return ['global'] + [a for a in self.arches if a in metadata.groups]
 
-    def get_deps(self, metadata, package):
+    def get_deps(self, metadata, package, recommended=None):
         """ Get a list of the dependencies of the given package.
 
         :param package: The name of the symbol
         :type package: string
         :returns: list of strings
         """
+        recs = []
+        if ((recommended is None and self.recommended) or
+            (recommended and recommended.lower() == 'true')):
+            for arch in self.get_arches(metadata):
+                if package in self.recommends[arch]:
+                    recs.extend(self.recommends[arch][package])
+
         for arch in self.get_arches(metadata):
             if package in self.deps[arch]:
-                return self.deps[arch][package]
-        return []
+                recs.extend(self.deps[arch][package])
+        return recs
 
     def get_provides(self, metadata, package):
         """ Get a list of all symbols provided by the given package.