diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-10 23:07:22 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-10 16:25:27 +0200 |
| commit | a88b978ec1b7c288ff4a136b9fc4812a81bb5072 (patch) | |
| tree | b4aa4f23d04318243e65ffaed4bdac110aa92b16 /src/lib/Bcfg2/Server/Plugins/Packages/Collection.py | |
| parent | 76c6796a85e1c5563246d57fb64035bfd6353675 (diff) | |
| download | bcfg2-a88b978ec1b7c288ff4a136b9fc4812a81bb5072.tar.gz bcfg2-a88b978ec1b7c288ff4a136b9fc4812a81bb5072.tar.bz2 bcfg2-a88b978ec1b7c288ff4a136b9fc4812a81bb5072.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/Collection.py')
| -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 ccb526a19..e0d6e1fc3 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py @@ -311,7 +311,7 @@ class Collection(list, 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 @@ -321,7 +321,7 @@ class Collection(list, 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); |