Merge commit 'lamby/master' into merge

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index f3380091f32ec81537181a7aacb270493123c3a1..0d92c7d934ed1e01c7f70c9a29bbd707e957842c 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -34,9 +34,12 @@ G{importgraph}
 ################################################################################
 
 import sys
-import imp
+import traceback
 import daklib.utils
 
+from daklib.daklog import Logger
+from daklib.config import Config
+
 ################################################################################
 
 def init():
@@ -153,6 +156,8 @@ Available commands:"""
 def main():
     """Launch dak functionality."""
 
+    logger = Logger(Config(), 'dak top-level', print_starting=False)
+
     functionality = init()
     modules = [ command for (command, _) in functionality ]
 
@@ -190,7 +195,17 @@ def main():
     # Invoke the module
     module = __import__(cmdname.replace("-","_"))
 
-    module.main()
+    try:
+        module.main()
+    except KeyboardInterrupt:
+        msg = 'KeyboardInterrupt caught; exiting'
+        print msg
+        logger.log([msg])
+        sys.exit(1)
+    except:
+        for line in traceback.format_exc().split('\n')[:-1]:
+            logger.log(['exception', line])
+        raise
 
 ################################################################################