diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-10 23:07:22 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <asulfrian@zedat.fu-berlin.de> | 2022-01-23 19:57:46 +0100 |
| commit | ef568d29698c00bf2c02c99a34b98e6b8ca96653 (patch) | |
| tree | 2d80f6b4f40e0e1ccb0b4b5c0d5a1668bd1f2b66 /src/lib/Bcfg2/Server/Plugins/Packages | |
| parent | 4e1a98aec6afa273bda82e3f840d3ed27e42b3be (diff) | |
| download | bcfg2-ef568d29698c00bf2c02c99a34b98e6b8ca96653.tar.gz bcfg2-ef568d29698c00bf2c02c99a34b98e6b8ca96653.tar.bz2 bcfg2-ef568d29698c00bf2c02c99a34b98e6b8ca96653.zip | |
PkgVars: Add support for multiple values
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 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); |