fix data_dir parameter parsing

This commit is contained in:
Victor Shyba 2018-12-21 16:34:33 -03:00 committed by Lex Berezhny
parent 6aa709e34e
commit 20dd1e55f5
2 changed files with 4 additions and 1 deletions

View file

@ -287,8 +287,11 @@ class Config:
self.default_data_dir, self.default_wallet_dir, self.default_download_dir = get_linux_directories() self.default_data_dir, self.default_wallet_dir, self.default_download_dir = get_linux_directories()
else: else:
assert None not in [data_dir, wallet_dir, download_dir] assert None not in [data_dir, wallet_dir, download_dir]
if data_dir:
self.default_data_dir = data_dir self.default_data_dir = data_dir
if wallet_dir:
self.default_wallet_dir = wallet_dir self.default_wallet_dir = wallet_dir
if download_dir:
self.default_download_dir = download_dir self.default_download_dir = download_dir
self._data = { self._data = {

View file

@ -207,7 +207,7 @@ def main(argv=None):
return 1 return 1
dir_args = {} dir_args = {}
if len(argv) > 2: if len(argv) >= 2:
dir_arg_keys = [ dir_arg_keys = [
'data_dir', 'data_dir',
'wallet_dir', 'wallet_dir',