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

resolved confict

Browse Source
This commit is contained in:
tpltnt 2017-04-11 11:04:50 +02:00
commit ad1b7a3dc3
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -39,6 +39,7 @@ pre-release code), you should create a virtualenv and install into that:
* ``cd tahoe-lafs``
* ``virtualenv venv``
* ``venv/bin/pip install appdirs packaging six``
* ``virtualenv --python=python2.7 venv``
* ``venv/bin/pip install --editable .``
* ``venv/bin/tahoe --version``

8
setup.py
View File

@ -276,8 +276,8 @@ setup(name="tahoe-lafs", # also set in __init__.py
"tox",
"foolscap[tor] >= 0.12.5",
"txtorcon >= 0.17.0", # in case pip's resolver doesn't work
"foolscap[i2p]",
"txi2p >= 0.3.1", # in case pip's resolver doesn't work
"foolscap[i2p] >= 0.12.6",
"txi2p >= 0.3.2", # in case pip's resolver doesn't work
"pytest",
"pytest-twisted",
],
@ -286,8 +286,8 @@ setup(name="tahoe-lafs", # also set in __init__.py
"txtorcon >= 0.17.0", # in case pip's resolver doesn't work
],
"i2p": [
"foolscap[i2p]",
"txi2p >= 0.3.1", # in case pip's resolver doesn't work
"foolscap[i2p] >= 0.12.6",
"txi2p >= 0.3.2", # in case pip's resolver doesn't work
],
},
package_data={"allmydata.web": ["*.xhtml",

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

@ -108,7 +108,7 @@ class MagicFolder(service.MultiService):
return self.uploader.start_monitoring()
def stopService(self):
return self.finish()
return defer.gatherResults([service.MultiService.stopService(self), self.finish()])
def ready(self):
"""ready is used to signal us to start

5
src/allmydata/scripts/create_node.py
View File

@ -350,11 +350,12 @@ def create_node(config):
write_client_config(c, config)
print >>out, "Node created in %s" % quote_local_unicode_path(basedir)
tahoe_cfg = quote_local_unicode_path(os.path.join(basedir, "tahoe.cfg"))
if not config.get("introducer", ""):
print >>out, " Please set [client]introducer.furl= in tahoe.cfg!"
print >>out, " Please set [client]introducer.furl= in %s!" % tahoe_cfg
print >>out, " The node cannot connect to a grid without it."
if not config.get("nickname", ""):
print >>out, " Please set [node]nickname= in tahoe.cfg"
print >>out, " Please set [node]nickname= in %s" % tahoe_cfg
defer.returnValue(0)
def create_client(config):