diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-07-22 16:14:17 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2020-07-22 16:14:17 +0000 |
| commit | cc7b3d680fe0d181dcde31bfb54baf391e035c4e (patch) | |
| tree | f9aaddd2b54b9470b6ecaa540481e6c3ea62788d | |
| parent | 1893e9a00893c083b7282dae31882e2aae39816d (diff) | |
| parent | b662a6eca551c8910fa76ba033b1138a3ed1a12f (diff) | |
| download | lorry-controller-cc7b3d680fe0d181dcde31bfb54baf391e035c4e.tar.gz | |
Merge branch 'bwh/minion-multiple-lorry-configs' into 'master'
MINION: Allow specifying multiple configuration files for Lorry
See merge request CodethinkLabs/lorry/lorry-controller!19
| -rwxr-xr-x | lorry-controller-minion | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lorry-controller-minion b/lorry-controller-minion index dfae50f..1900313 100755 --- a/lorry-controller-minion +++ b/lorry-controller-minion @@ -73,7 +73,7 @@ class MINION(cliapp.Application): metavar='CMD', default='lorry') - self.settings.string( + self.settings.string_list( ['lorry-config'], 'lorry configuration file to use', metavar='LORRY_CFG') @@ -167,8 +167,8 @@ class MINION(cliapp.Application): self.settings['lorry-cmd'] ] - if self.settings['lorry-config']: - argv.extend(['--config', self.settings['lorry-config']]) + argv.extend(['--config=' + name + for name in self.settings['lorry-config']]) argv.append(self.temp_lorry_filename) |