X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdaklog.py;h=fb33b0bdab18160525e1c3183d828f1559abba0e;hb=9f523eb071132709bcb68234f9a8bd7c22d3565c;hp=0cca205e96bf83b6e1cad2c7f785e650c814b848;hpb=307823ca2367f65ccfbbc7c0bd5054f2883b9c9c;p=dak.git

diff --git a/daklib/daklog.py b/daklib/daklog.py
old mode 100755
new mode 100644
index 0cca205e..fb33b0bd
--- 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,13 +58,13 @@ class Logger:
             logfile = utils.open_file(logfilename, 'a')
             os.umask(umask)
         self.logfile = logfile
-        # Log the start of the program
-        user = pwd.getpwuid(os.getuid())[0]
-        self.log(["program start", user])
+        if print_starting:
+            self.log(["program start"])
 
     def log (self, details):
         "Log an event"
-        # Prepend the timestamp and program name
+        # Prepend timestamp, program name, and user name
+        details.insert(0, utils.getusername())
         details.insert(0, self.program)
         timestamp = time.strftime("%Y%m%d%H%M%S")
         details.insert(0, timestamp)