summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Packages
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-03-10 23:07:22 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-02-26 13:38:17 +0100
commit2f132ae29f1bf4a23cff2abe8b23ce72703ab4b0 (patch)
tree111df50c2771f4f6baec0608891be4ef5002c1ba /src/lib/Bcfg2/Server/Plugins/Packages
parentd274182a2ea61c681c4fccec893898150a283ae9 (diff)
downloadbcfg2-2f132ae29f1bf4a23cff2abe8b23ce72703ab4b0.tar.gz
bcfg2-2f132ae29f1bf4a23cff2abe8b23ce72703ab4b0.tar.bz2
bcfg2-2f132ae29f1bf4a23cff2abe8b23ce72703ab4b0.zip
Plugins/PkgVars: support multiple values per package
If multiple values specified for one package all values are joined together in a set.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Collection.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
index 2496d9aa1..4f630fecf 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
@@ -330,7 +330,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
pin_source = pinnings[package]
for source in self:
- if pin_source and pin_source != source.name:
+ if pin_source and source.name not in pin_source:
continue
pin_found = True
@@ -340,7 +340,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
if not pin_found:
if pin_source:
self.logger.error("Packages: Source '%s' for package '%s' not found" %
- (pin_source, package))
+ (' or '.join(pin_source), package))
else:
self.logger.error("Packages: No source found for package '%s'" %
package);