Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Don't ignore KeyboardInterrupt either in process_unchecked
  Don't log "dak top-level starting" every time we run "dak ls" or something.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/dak.py b/dak/dak.py
index 448c137f9ca903687e0ab70bf21e53fd039616da..0d92c7d934ed1e01c7f70c9a29bbd707e957842c 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -156,7 +156,7 @@ Available commands:"""
 def main():
     """Launch dak functionality."""
 
-    logger = Logger(Config(), 'dak top-level')
+    logger = Logger(Config(), 'dak top-level', print_starting=False)
 
     functionality = init()
     modules = [ command for (command, _) in functionality ]

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 5463f1a6521a7219332614396359719b13aca514..db29ac42a1a1220ddf9e30e332861049c42a5cac 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -507,7 +507,7 @@ def process_it(changes_file):
 
         action(u)
 
-    except SystemExit:
+    except (SystemExit, KeyboardInterrupt):
         raise
 
     except:

diff --git a/daklib/daklog.py b/daklib/daklog.py
index dfcae368089f0c1d2a0d2e56b9e6e8fa218c6d6a..fb33b0bdab18160525e1c3183d828f1559abba0e 100755 (executable)
--- a/daklib/daklog.py
+++ b/daklib/daklog.py
@@ -38,7 +38,7 @@ class Logger:
     logfile = None
     program = None
 
-    def __init__ (self, Cnf, program, debug=0):
+    def __init__ (self, Cnf, program, debug=0, print_starting=True):
         "Initialize a new Logger object"
         self.Cnf = Cnf
         self.program = program
@@ -58,7 +58,8 @@ class Logger:
             logfile = utils.open_file(logfilename, 'a')
             os.umask(umask)
         self.logfile = logfile
-        self.log(["program start"])
+        if print_starting:
+            self.log(["program start"])
 
     def log (self, details):
         "Log an event"