Add download.umask config option with default of 077

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / client.py

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index f86c6fc2fc983e028dfcb46f319435977faa6638..9a0a5de8334a19ef4d8546fc3eed5258df4fcfc2 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -513,13 +513,13 @@ class Client(node.Node, pollmixin.PollMixin):
             dbfile = abspath_expanduser_unicode(dbfile)
 
             from allmydata.frontends import magic_folder
-
-            s = magic_folder.MagicFolder(self, upload_dircap, collective_dircap, local_dir, dbfile)
+            umask = self.get_config("magic_folder", "download.umask", 0077)
+            s = magic_folder.MagicFolder(self, upload_dircap, collective_dircap, local_dir, dbfile, umask)
             s.setServiceParent(self)
             s.startService()
 
             # start processing the upload queue when we've connected to enough servers
-            self.connected_enough_d.addCallback(s.ready)
+            self.connected_enough_d.addCallback(lambda ign: s.ready())
 
     def _check_exit_trigger(self, exit_trigger_file):
         if os.path.exists(exit_trigger_file):