LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix -v syntax

Browse source 
After the introduction of arguments for -v, it would sometimes incorrectly consume the CLI cmd as its argument.
This change keeps the old "-v" syntax working, at the cost of having to provide the arguments without a whitespace directly after -v (and the args need to be single letters).
This commit is contained in:
SomberNight 2018-08-30 18:34:04 +02:00
parent aac7a34405
commit 6ee689345f
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/commands.py
View file

@ -832,7 +832,7 @@ def add_global_options(parser):
group = parser.add_argument_group('global options') group = parser.add_argument_group('global options')
# const is for when no argument is given to verbosity # const is for when no argument is given to verbosity
# default is for when the flag is missing # default is for when the flag is missing
group.add_argument("-v", "--verbosity", dest="verbosity", help="Set verbosity filter", default='', const='*', nargs='?') group.add_argument("-v", dest="verbosity", help="Set verbosity filter", default='', const='*', nargs='?')
group.add_argument("-D", "--dir", dest="electrum_path", help="electrum directory") group.add_argument("-D", "--dir", dest="electrum_path", help="electrum directory")
group.add_argument("-P", "--portable", action="store_true", dest="portable", default=False, help="Use local 'electrum_data' directory") group.add_argument("-P", "--portable", action="store_true", dest="portable", default=False, help="Use local 'electrum_data' directory")
group.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path") group.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path")

8
run_electrum
View file

@ -335,6 +335,14 @@ if __name__ == '__main__':
sys.argv.remove('help') sys.argv.remove('help')
sys.argv.append('-h') sys.argv.append('-h')
# old '-v' syntax
try:
i = sys.argv.index('-v')
except ValueError:
pass
else:
sys.argv[i] = '-v*'
# read arguments from stdin pipe and prompt # read arguments from stdin pipe and prompt
for i, arg in enumerate(sys.argv): for i, arg in enumerate(sys.argv):
if arg == '-': if arg == '-':