From: Daira Hopwood Date: Mon, 21 Dec 2015 21:59:57 +0000 (+0000) Subject: Teach magic-folder join to use configutil. X-Git-Url: https://git.rkrishnan.org/simplejson/components/configuration.txt?a=commitdiff_plain;h=6a29027926a5cbe85975c89ff4e2f785a13fe8f3;p=tahoe-lafs%2Ftahoe-lafs.git Teach magic-folder join to use configutil. Author: David Stainton Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/scripts/magic_folder_cli.py b/src/allmydata/scripts/magic_folder_cli.py index e15176d1..b31162e6 100644 --- a/src/allmydata/scripts/magic_folder_cli.py +++ b/src/allmydata/scripts/magic_folder_cli.py @@ -13,6 +13,7 @@ import tahoe_mv from allmydata.util.encodingutil import argv_to_abspath, argv_to_unicode, to_str, \ quote_local_unicode_path from allmydata.util import fileutil +from allmydata.util import configutil from allmydata import uri INVITE_SEPARATOR = "+" @@ -163,10 +164,10 @@ def join(options): fileutil.write(dmd_cap_file, dmd_write_cap) fileutil.write(collective_readcap_file, magic_readonly_cap) - # FIXME: modify any existing [magic_folder] fields, rather than appending. - fileutil.write(os.path.join(options["node-directory"], u"tahoe.cfg"), - "[magic_folder]\nenabled = True\nlocal.directory = %s\n" - % (options.local_dir.encode('utf-8'),), mode="ab") + config = configutil.get_config(os.path.join(options["node-directory"], u"tahoe.cfg")) + configutil.set_config(config, "magic_folder", "enabled", "True") + configutil.set_config(config, "magic_folder", "local.directory", options.local_dir.encode('utf-8')) + configutil.write_config(os.path.join(options["node-directory"], u"tahoe.cfg"), config) return 0 class LeaveOptions(BasedirOptions):