tfix: pass cwd with config_options - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 73822e8ec250ed99ec34a88c450fcd98c8fe5d1d
DIR parent 9a454b60ce5bd154a46f228a2ad6cc79359c7406
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 24 Feb 2016 16:57:58 +0100
fix: pass cwd with config_options
Diffstat:
M electrum | 3 ++-
M lib/simple_config.py | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -286,7 +286,6 @@ if __name__ == '__main__':
'verbose': True,
'cmd': 'gui',
'gui': 'kivy',
- #'auto_connect': True,
}
else:
config_options = args.__dict__
t@@ -296,6 +295,8 @@ if __name__ == '__main__':
if config_options.get('server'):
config_options['auto_connect'] = False
+ config_options['cwd'] = os.getcwd()
+
if config_options.get('portable'):
config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
DIR diff --git a/lib/simple_config.py b/lib/simple_config.py
t@@ -139,9 +139,8 @@ class SimpleConfig(PrintError):
"""Set the path of the wallet."""
# command line -w option
- path = self.get('wallet_path')
- if path:
- return path
+ if self.get('wallet_path'):
+ return os.path.join(self.get('cwd'), self.get('wallet_path'))
# path in config file
path = self.get('default_wallet_path')