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

basedir fixup

Browse Source
This commit is contained in:
meejah 2018-03-04 18:49:24 -07:00
parent 2d044e1324
commit 136495e405
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/util/tor_provider.py
View File

@ -266,11 +266,7 @@ class _Provider(service.MultiService):
# this fires with a tuple of (control_endpoint, tor_protocol)
if not self._tor_launched:
self._tor_launched = OneShotObserverList()
<<<<<<< HEAD
private_dir = self._config.get_config_path("private")
=======
private_dir = os.path.join(self._config._basedir, "private")
>>>>>>> pull 'basedir' entirely into _Config
tor_binary = self._get_tor_config("tor.executable", None)
d = _launch_tor(reactor, tor_binary, private_dir, self._txtorcon)
d.addBoth(self._tor_launched.fire)