summaryrefslogtreecommitdiff
path: root/lorry-controller
diff options
context:
space:
mode:
Diffstat (limited to 'lorry-controller')
-rwxr-xr-xlorry-controller8
1 files changed, 8 insertions, 0 deletions
diff --git a/lorry-controller b/lorry-controller
index 1ead6c7..1b2fb74 100755
--- a/lorry-controller
+++ b/lorry-controller
@@ -11,6 +11,7 @@ defaults = {
'work-area': '/home/lorry/controller-area'
}
+from lorrycontroller.confparser import LorryControllerConfig
class LorryController(cliapp.Application):
@@ -39,6 +40,13 @@ class LorryController(cliapp.Application):
self.rungit(['reset', '--hard', 'origin/master'])
self.rungit(['clean', '-fdx'])
+ if not os.path.exists('git/lorry-controller.conf'):
+ logging.error("Unable to find lorry-controller.conf in git")
+ raise SystemExit(4)
+
+ conf = LorryControllerConfig(self.settings,
+ 'git/lorry-controller.conf')
+
def rungit(self, args):
self.runcmd(['git']+args, cwd=os.path.join(self.settings['work-area'],