AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #6635 from SomberNight/202010_cli_wallet_arg_order

Browse Source 
CLI: allow specifying --wallet at any arg position, as before
This commit is contained in:
ThomasV
2020-10-06 14:34:26 +02:00
committed by GitHub
parent 84dc181b6e 83e61d6743
commit 15a77e2f47
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/commands.py
View File

@@ -1351,6 +1351,7 @@ def get_parser():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
epilog="Run 'electrum help <command>' to see the help for a command") epilog="Run 'electrum help <command>' to see the help for a command")
add_global_options(parser) add_global_options(parser)
add_wallet_option(parser)
subparsers = parser.add_subparsers(dest='cmd', metavar='<command>') subparsers = parser.add_subparsers(dest='cmd', metavar='<command>')
# gui # gui
parser_gui = subparsers.add_parser('gui', description="Run Electrum's Graphical User Interface.", help="Run GUI (default)") parser_gui = subparsers.add_parser('gui', description="Run Electrum's Graphical User Interface.", help="Run GUI (default)")

3
electrum/daemon.py
View File

@@ -413,6 +413,9 @@ class Daemon(Logger):
fd = get_file_descriptor(config) fd = get_file_descriptor(config)
if fd is None: if fd is None:
raise Exception('failed to lock daemon; already running?') raise Exception('failed to lock daemon; already running?')
if 'wallet_path' in config.cmdline_options:
self.logger.warning("Ignoring parameter 'wallet_path' for daemon. "
"Use the load_wallet command instead.")
self.asyncio_loop = asyncio.get_event_loop() self.asyncio_loop = asyncio.get_event_loop()
self.network = None self.network = None
if not config.get('offline'): if not config.get('offline'):