respect umask on filestorage backend (fixes [SF#744328])

patch from Ulrik Mikaelsson

also: some trailing whitespace got removed

Author: Justus Pendleton

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.205 2007-08-31 15:44:02 jpend Exp $
+#$Id: back_anydbm.py,v 1.206 2007-09-11 21:33:30 jpend Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -85,6 +85,7 @@ def __init__(self, config, journaltag=None):
         Class.set(), Class.retire(), and Class.restore() methods are
         disabled.
         '''
+        FileStorage.__init__(self, config.UMASK)
         self.config, self.journaltag = config, journaltag
         self.dir = config.DATABASE
         self.classes = {}

roundup/backends/blobfiles.py

@@ -14,8 +14,8 @@
 # FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-# 
-#$Id: blobfiles.py,v 1.19 2005-06-08 03:35:18 anthonybaxter Exp $
+#
+#$Id: blobfiles.py,v 1.20 2007-09-11 21:33:30 jpend Exp $
 '''This module exports file storage for roundup backends.
 Files are stored into a directory hierarchy.
 '''
@@ -36,22 +36,25 @@ def files_in_dir(dir):
     return num_files
 
 class FileStorage:
-    """Store files in some directory structure"""    
+    def __init__(self, umask):
+        self.umask = umask
+
+    """Store files in some directory structure"""
     def subdirFilename(self, classname, nodeid, property=None):
         """Determine what the filename and subdir for nodeid + classname is."""
         if property:
             name = '%s%s.%s'%(classname, nodeid, property)
         else:
-            # roundupdb.FileClass never specified the property name, so don't 
+            # roundupdb.FileClass never specified the property name, so don't
             # include it
             name = '%s%s'%(classname, nodeid)
-        
+
         # have a separate subdir for every thousand messages
         subdir = str(int(nodeid) / 1000)
         return os.path.join(subdir, name)
-    
+
     def filename(self, classname, nodeid, property=None, create=0):
-        '''Determine what the filename for the given node and optionally 
+        '''Determine what the filename for the given node and optionally
         property is.
 
         Try a variety of different filenames - the file could be in the
@@ -101,6 +104,10 @@ def storefile(self, classname, nodeid, property, content):
             # save off the rename action
             self.transactions.append((self.doStoreFile, (classname, nodeid,
                 property)))
+	# always set umask before writing to make sure we have the proper one
+	# in multi-tracker (i.e. multi-umask) or modpython scenarios
+	# the umask may have changed since last we set it.
+        os.umask(self.umask)
         open(name, 'wb').write(content)
 
     def getfile(self, classname, nodeid, property):

roundup/backends/rdbms_common.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: rdbms_common.py,v 1.188 2007-08-31 15:44:02 jpend Exp $
+#$Id: rdbms_common.py,v 1.189 2007-09-11 21:33:30 jpend Exp $
 """ Relational database (SQL) backend common code.
 
 Basics:
@@ -106,6 +106,7 @@ class Database(FileStorage, hyperdb.Database, roundupdb.Database):
     def __init__(self, config, journaltag=None):
         """ Open the database and load the schema from it.
         """
+        FileStorage.__init__(self, config.UMASK)
         self.config, self.journaltag = config, journaltag
         self.dir = config.DATABASE
         self.classes = {}