From 859c81c81b0cedc22ae23ac992e172023523540d Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 2 Jan 2019 02:31:04 +0100 Subject: [PATCH] Rev3746, Fix open_browser parsing with non-main cli command --- src/Config.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Config.py b/src/Config.py index 6a12a187..b91638c5 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.4" - self.rev = 3745 + self.rev = 3746 self.argv = argv self.action = None self.pending_changes = {} @@ -400,16 +400,17 @@ class Config(object): if section != "global": # If not global prefix key with section 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] if val: for line in val.strip().split("\n"): # Allow multi-line values argv_extend.append(line) - if to_end: - argv = argv[:-2] + argv_extend + argv[-2:] - else: - argv = argv[:1] + argv_extend + argv[1:] + argv = argv[:1] + argv_extend + argv[1:] return argv # Expose arguments as class attributes