merge ftpmaster branch

[dak.git] / daklib / logging.py

diff --git a/daklib/logging.py b/daklib/logging.py
index 11792c8baff4911965aad7907ba14676d7b64cc6..f0dcd9c94201435288f3bd37e9e8896b4edc8631 100644 (file)
--- a/daklib/logging.py
+++ b/daklib/logging.py
@@ -2,7 +2,6 @@
 
 # Logging functions
 # Copyright (C) 2001, 2002, 2006  James Troup <james@nocrew.org>
-# $Id: logging.py,v 1.4 2005-11-15 09:50:32 ajt Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,13 +39,16 @@ class Logger:
         if not os.path.exists(logdir):
             umask = os.umask(00000)
             os.makedirs(logdir, 02775)
+            os.umask(umask)
         # Open the logfile
         logfilename = "%s/%s" % (logdir, time.strftime("%Y-%m"))
-       logfile = None
-       if debug:
-           logfile = sys.stderr
-       else:
-           logfile = utils.open_file(logfilename, 'a')
+        logfile = None
+        if debug:
+            logfile = sys.stderr
+        else:
+            umask = os.umask(00002)
+            logfile = utils.open_file(logfilename, 'a')
+            os.umask(umask)
         self.logfile = logfile
         # Log the start of the program
         user = pwd.getpwuid(os.getuid())[0]