oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev3746, Fix open_browser parsing with non-main cli command

Browse source
This commit is contained in:
shortcutme 2019-01-02 02:31:04 +01:00
parent 83ed87cec0
commit 859c81c81b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.4" self.version = "0.6.4"
self.rev = 3745 self.rev = 3746
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}
@ -400,16 +400,17 @@ class Config(object):
if section != "global": # If not global prefix key with section if section != "global": # If not global prefix key with section
key = section + "_" + key key = section + "_" + key
to_end = key == "open_browser" # Prefer config value over argument if key == "open_browser": # Prefer config file value over cli argument
if "--%s" % key in argv:
pos = argv.index("--open_browser")
del argv[pos:pos + 2]
argv_extend = ["--%s" % key] argv_extend = ["--%s" % key]
if val: if val:
for line in val.strip().split("\n"): # Allow multi-line values for line in val.strip().split("\n"): # Allow multi-line values
argv_extend.append(line) argv_extend.append(line)
if to_end: argv = argv[:1] + argv_extend + argv[1:]
argv = argv[:-2] + argv_extend + argv[-2:]
else:
argv = argv[:1] + argv_extend + argv[1:]
return argv return argv
# Expose arguments as class attributes # Expose arguments as class attributes