Plugins/PkgVars: support multiple values per package

If multiple values specified for one package all values are joined
together in a set.

2 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/Server/Plugins/Packages/Collection.py b/src/lib/Server/Plugins/Packages/Collection.py
index 2e5ff450b..6c34aa884 100644
--- a/src/lib/Server/Plugins/Packages/Collection.py
+++ b/src/lib/Server/Plugins/Packages/Collection.py
@@ -104,7 +104,7 @@ class Collection(Bcfg2.Server.Plugin.Debuggable):
             recommended = recs[package]
 
         for source in self.sources:
-            if pin_source and pin_source != source.name:
+            if pin_source and source.name not in pin_source:
                 continue
             pin_found = True
 
@@ -113,7 +113,7 @@ class Collection(Bcfg2.Server.Plugin.Debuggable):
 
         if not pin_found:
             self.logger.error("Packages: Source '%s' for package '%s' not found" %
-                              (pin_source, package))
+                              (' or '.join(pin_source), package))
         return []
 
     def get_provides(self, package):
diff --git a/src/lib/Server/Plugins/PkgVars.py b/src/lib/Server/Plugins/PkgVars.py
index 2bf1b158a..40582bcb3 100644
--- a/src/lib/Server/Plugins/PkgVars.py
+++ b/src/lib/Server/Plugins/PkgVars.py
@@ -19,7 +19,12 @@ class PkgVarsFile(Bcfg2.Server.Plugin.StructFile):
             for v in vars:
                 value = d.get(v, None)
                 if value:
-                    results[v][name] = value
+                    if v not in results:
+                        results[v] = {}
+                    if name not in results[v]:
+                        results[v][name] = set()
+
+                    results[v][name].add(value)
 
         return results
 
@@ -35,7 +40,8 @@ class PkgVarsDirectoryBacked(Bcfg2.Server.Plugin.DirectoryBacked):
         for files in self.entries:
             new = self.entries[files].get_additional_data(meta)
             for x in vars:
-                results[x].update(new[x])
+                if x in new:
+                    results[x].update(new[x])
 
         return results