diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-10 23:07:22 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-05-02 11:02:38 +0200 |
| commit | a9c1622339e1a2b6911c01705a492e5d4574561e (patch) | |
| tree | f6f298efb7927a06246fb99dcbf392874999566a /src/lib/Server/Plugins/Packages | |
| parent | 14893730199bb559bc819571832b40cc6f22ebf7 (diff) | |
| download | bcfg2-a9c1622339e1a2b6911c01705a492e5d4574561e.tar.gz bcfg2-a9c1622339e1a2b6911c01705a492e5d4574561e.tar.bz2 bcfg2-a9c1622339e1a2b6911c01705a492e5d4574561e.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/Server/Plugins/Packages')
| -rw-r--r-- | src/lib/Server/Plugins/Packages/Collection.py | 4 |
1 files changed, 2 insertions, 2 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): |