diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-10 23:07:22 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-06-29 16:28:46 +0200 |
commit | 842cd1e3c63650f41c08c4a22c6d3bb475299cf8 (patch) | |
tree | 93cfc9237c0fefe911d13c0ac727250a77b8f891 /src/lib/Bcfg2/Server/Plugins/Packages | |
parent | 8a83dcaa633c9b2864031fa317f8f17b545f43f5 (diff) | |
download | bcfg2-842cd1e3c63650f41c08c4a22c6d3bb475299cf8.tar.gz bcfg2-842cd1e3c63650f41c08c4a22c6d3bb475299cf8.tar.bz2 bcfg2-842cd1e3c63650f41c08c4a22c6d3bb475299cf8.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.py | 4 |
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 7688ebddd..93b398ac4 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 @@ -339,7 +339,7 @@ class Collection(list, 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 [] |