Skip to content

Commit d50b152

Browse files
author
Dmitry Surnin
committed
Expand user before directory creation
1 parent 98f3f4f commit d50b152

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

plenum/common/test_network_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def domain_ledger_file_name(cls, config, envName):
158158

159159
@classmethod
160160
def setup_base_dir(cls, config, network_name):
161-
baseDir = os.path.join(config.baseDir, network_name)
161+
baseDir = os.path.join(os.path.expanduser(config.baseDir), network_name)
162162
if not os.path.exists(baseDir):
163163
os.makedirs(baseDir, exist_ok=True)
164164
return baseDir

plenum/server/node.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,11 @@ def __init__(self,
129129
self.name = name
130130
self.config = config or getConfig()
131131
self.basedirpath = basedirpath or os.path.join(self.config.baseDir, self.config.NETWORK_NAME)
132+
self.basedirpath = os.path.expanduser(self.basedirpath)
132133
self.dataDir = self.config.nodeDataDir or "data/nodes"
133134
self.base_data_dir = base_data_dir or os.path.join(self.config.NODE_BASE_DATA_DIR,
134135
self.config.NETWORK_NAME)
136+
self.base_data_dir = os.path.expanduser(self.base_data_dir)
135137

136138
self._view_change_timeout = self.config.VIEW_CHANGE_TIMEOUT
137139

0 commit comments

Comments
 (0)