AaronFiore/electrum
1
0
Fork 0
Code Activity

fix -P option

Browse Source
This commit is contained in:
ThomasV
2015-05-30 06:56:45 +02:00
parent 6201133c48
commit 701527df20
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum
View File

@@ -402,9 +402,6 @@ if __name__ == '__main__':
parser = get_parser(run_gui, run_daemon, run_cmdline) parser = get_parser(run_gui, run_daemon, run_cmdline)
args = parser.parse_args() 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) # config is an object passed to the various constructors (wallet, interface, gui)
if is_android: if is_android:
config_options = { config_options = {
@@ -421,6 +418,9 @@ if __name__ == '__main__':
if config_options.get('server'): if config_options.get('server'):
config_options['auto_connect'] = False 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')) set_verbosity(config_options.get('verbose'))
config = SimpleConfig(config_options) config = SimpleConfig(config_options)

2
lib/commands.py
View File

@@ -173,7 +173,7 @@ def get_parser(run_gui, run_daemon, run_cmdline):
add_offline_option(parser_gui) add_offline_option(parser_gui)
add_wallet_options(parser_gui) add_wallet_options(parser_gui)
# daemon # 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.add_argument("subcommand", choices=['start', 'status', 'stop'])
parser_daemon.set_defaults(func=run_daemon) parser_daemon.set_defaults(func=run_daemon)
# create a parser for each command # create a parser for each command