electrum

commit 15a77e2f47eec8665377fb6431da237a660b16e3
parent 84dc181b6e7bb20e88ef6b98fb8925c5f645a765
Author: ThomasV <thomasv@electrum.org>
Date:   Tue,  6 Oct 2020 14:34:26 +0200

Merge pull request #6635 from SomberNight/202010_cli_wallet_arg_order

CLI: allow specifying --wallet at any arg position, as before
Diffstat:
M
electrum/commands.py
 | 
1
+
M
electrum/daemon.py
 | 
3
+++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/electrum/commands.py b/electrum/commands.py
@@ -1351,6 +1351,7 @@ def get_parser():
     parser = argparse.ArgumentParser(
         epilog="Run 'electrum help <command>' to see the help for a command")
     add_global_options(parser)
+    add_wallet_option(parser)
     subparsers = parser.add_subparsers(dest='cmd', metavar='<command>')
     # gui
     parser_gui = subparsers.add_parser('gui', description="Run Electrum's Graphical User Interface.", help="Run GUI (default)")
diff --git a/electrum/daemon.py b/electrum/daemon.py
@@ -413,6 +413,9 @@ class Daemon(Logger):
             fd = get_file_descriptor(config)
             if fd is None:
                 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.network = None
         if not config.get('offline'):