From 721cef29357d960ab3a670f37bc45f0df6f853a3 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 9 Jul 2019 17:19:38 +0100
Subject: Minion: Support setting lorry config file

---
 lorry-controller-minion | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lorry-controller-minion')

diff --git a/lorry-controller-minion b/lorry-controller-minion
index 9eb6657..459130e 100755
--- a/lorry-controller-minion
+++ b/lorry-controller-minion
@@ -73,6 +73,11 @@ class MINION(cliapp.Application):
             metavar='CMD',
             default='lorry')
 
+        self.settings.string(
+            ['lorry-config'],
+            'lorry configuration file to use',
+            metavar='LORRY_CFG')
+
         self.settings.string(
             ['lorry-working-area'],
             'where will Lorry put its files?',
@@ -157,10 +162,15 @@ class MINION(cliapp.Application):
         os.write(fd, job_spec['text'])
         os.close(fd)
 
+
         argv = [
-            self.settings['lorry-cmd'],
-            self.temp_lorry_filename,
-            ]
+            self.settings['lorry-cmd']
+        ]
+
+        if self.settings['lorry-config']:
+            argv.extend(['--config', self.settings['lorry-config']])
+
+        argv.append(self.temp_lorry_filename)
 
         pipe = os.pipe()
         self.stdout_fd = pipe[0]
-- 
cgit v1.2.1