ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing information/import

Browse Source
This commit is contained in:
Jean-Paul Calderone 2018-04-23 11:09:24 -04:00
parent 8d104dab1c
commit cfa33332a5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/client.py
View File

@ -593,7 +593,7 @@ class _Client(node.Node, pollmixin.PollMixin):
for (name, mf_config) in magic_folders.items():
self.log("Starting magic_folder '{}'".format(name))
s = magic_folder.MagicFolder.from_config(self.basedir, mf_config)
s = magic_folder.MagicFolder.from_config(self.basedir, name, mf_config)
self._magic_folders[name] = s
s.setServiceParent(self)
s.startService()

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

@ -18,7 +18,12 @@ from zope.interface import Interface, Attribute, implementer
from allmydata.util import fileutil, configutil, yamlutil
from allmydata.interfaces import IDirectoryNode
from allmydata.util import log
from allmydata.util.fileutil import precondition_abspath, get_pathinfo, ConflictError
from allmydata.util.fileutil import (
precondition_abspath,
get_pathinfo,
ConflictError,
abspath_expanduser_unicode,
)
from allmydata.util.assertutil import precondition, _assert
from allmydata.util.deferredutil import HookMixin
from allmydata.util.progress import PercentProgress
@ -245,7 +250,7 @@ def save_magic_folders(node_directory, folders):
class MagicFolder(service.MultiService):
@classmethod
def from_config(cls, client_node, config):
def from_config(cls, client_node, name, config):
"""
Create a ``MagicFolder`` from a client node and magic-folder
configuration.