tfix -P option - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 701527df2075d9ec468b4b3a1da9ee6cd6aadbf9
DIR parent 6201133c48fe605569c37f4e862829945bf5ff50
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 30 May 2015 06:56:45 +0200
fix -P option
Diffstat:
M electrum | 6 +++---
M lib/commands.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -402,9 +402,6 @@ if __name__ == '__main__':
parser = get_parser(run_gui, run_daemon, run_cmdline)
args = parser.parse_args()
- if args.portable and args.wallet_path is None:
- args.electrum_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
-
# config is an object passed to the various constructors (wallet, interface, gui)
if is_android:
config_options = {
t@@ -421,6 +418,9 @@ if __name__ == '__main__':
if config_options.get('server'):
config_options['auto_connect'] = False
+ if config_options.get('portable') and config_options.get('wallet_path') is None:
+ config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
+
set_verbosity(config_options.get('verbose'))
config = SimpleConfig(config_options)
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -173,7 +173,7 @@ def get_parser(run_gui, run_daemon, run_cmdline):
add_offline_option(parser_gui)
add_wallet_options(parser_gui)
# daemon
- parser_daemon = subparsers.add_parser('daemon', help="Run Daemon")
+ parser_daemon = subparsers.add_parser('daemon', parents=[parent_parser, conn_parser], help="Run Daemon")
parser_daemon.add_argument("subcommand", choices=['start', 'status', 'stop'])
parser_daemon.set_defaults(func=run_daemon)
# create a parser for each command