disable auo-connect is --server option is passed. fixes #992
This commit is contained in:
parent
3d2a410de0
commit
935a9a980d
3
electrum
3
electrum
|
@ -206,9 +206,10 @@ if __name__ == '__main__':
|
||||||
for k, v in config_options.items():
|
for k, v in config_options.items():
|
||||||
if v is None:
|
if v is None:
|
||||||
config_options.pop(k)
|
config_options.pop(k)
|
||||||
|
if config_options.get('server'):
|
||||||
|
config_options['auto_cycle'] = False
|
||||||
|
|
||||||
set_verbosity(config_options.get('verbose'))
|
set_verbosity(config_options.get('verbose'))
|
||||||
|
|
||||||
config = SimpleConfig(config_options)
|
config = SimpleConfig(config_options)
|
||||||
print_error("CA bundle:", requests.utils.DEFAULT_CA_BUNDLE_PATH, "found" if os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH) else "not found")
|
print_error("CA bundle:", requests.utils.DEFAULT_CA_BUNDLE_PATH, "found" if os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH) else "not found")
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ class SimpleConfig(object):
|
||||||
out = None
|
out = None
|
||||||
with self.lock:
|
with self.lock:
|
||||||
out = self.read_only_options.get(key)
|
out = self.read_only_options.get(key)
|
||||||
if not out:
|
if out is None:
|
||||||
out = self.user_config.get(key, default)
|
out = self.user_config.get(key, default)
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue