ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix path-creation cases after merge

Browse Source
This commit is contained in:
meejah 2018-08-20 17:40:53 -06:00
parent dab291c72f
commit cce4a92900
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/frontends/magic_folder.py
View File

@ -309,11 +309,7 @@ class MagicFolder(service.MultiService):
:param dict config: Magic-folder configuration like that in the list :param dict config: Magic-folder configuration like that in the list
returned by ``load_magic_folders``. returned by ``load_magic_folders``.
""" """
db_filename = os.path.join( db_filename = client_node.config.get_private_path("magicfolder_{}.sqlite".format(name))
client_node.basedir,
"private",
"magicfolder_{}.sqlite".format(name),
)
local_dir_config = config['directory'] local_dir_config = config['directory']
try: try:
poll_interval = int(config["poll_interval"]) poll_interval = int(config["poll_interval"])
@ -324,9 +320,10 @@ class MagicFolder(service.MultiService):
client=client_node, client=client_node,
upload_dircap=config["upload_dircap"], upload_dircap=config["upload_dircap"],
collective_dircap=config["collective_dircap"], collective_dircap=config["collective_dircap"],
# XXX surely a better way for this local_path_u business
local_path_u=abspath_expanduser_unicode( local_path_u=abspath_expanduser_unicode(
local_dir_config, local_dir_config,
base=client_node.basedir, base=client_node.config.get_config_path(),
), ),
dbfile=abspath_expanduser_unicode(db_filename), dbfile=abspath_expanduser_unicode(db_filename),
umask=config["umask"], umask=config["umask"],