From 556de590bc08d94c98140ef968c7cd8d61458f2c Mon Sep 17 00:00:00 2001 From: Sujai Kumar Gupta Date: Wed, 17 Jan 2024 10:45:31 +0530 Subject: [PATCH 1/3] override the configuration to default false --- kolibri/utils/options.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kolibri/utils/options.py b/kolibri/utils/options.py index 8a3005e196..9c43435dcb 100644 --- a/kolibri/utils/options.py +++ b/kolibri/utils/options.py @@ -1007,5 +1007,10 @@ def generate_empty_options_file(ini_filename="options.ini"): comments.append("{} = {}".format(optname, attrs.get("default", ""))) comments.append("") conf.final_comment = comments + for section, opts in option_spec.items(): + for optname, attrs in opts.items(): + for envvar in attrs.get("envvars", []): + if envvar in os.environ: + conf[section][optname]='False' conf.write() From 1e6a08be1611f648adc795270f0faede8ae5d4ce Mon Sep 17 00:00:00 2001 From: Sujai Kumar Gupta Date: Wed, 17 Jan 2024 10:56:51 +0530 Subject: [PATCH 2/3] remove conf overriding in _set_from_envvars --- kolibri/utils/options.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kolibri/utils/options.py b/kolibri/utils/options.py index 9c43435dcb..ab1575845f 100644 --- a/kolibri/utils/options.py +++ b/kolibri/utils/options.py @@ -827,7 +827,6 @@ def _set_from_envvars(conf): optname=optname, section=section ) ) - conf[section][optname] = os.environ[envvar] using_env_vars[optname] = envvar break return using_env_vars @@ -1007,10 +1006,5 @@ def generate_empty_options_file(ini_filename="options.ini"): comments.append("{} = {}".format(optname, attrs.get("default", ""))) comments.append("") conf.final_comment = comments - for section, opts in option_spec.items(): - for optname, attrs in opts.items(): - for envvar in attrs.get("envvars", []): - if envvar in os.environ: - conf[section][optname]='False' conf.write() From 505cacbcf949501842e62963f62b11516e04e0c9 Mon Sep 17 00:00:00 2001 From: Sujai Kumar Gupta Date: Thu, 18 Jan 2024 14:02:23 +0530 Subject: [PATCH 3/3] remove envvar from conf that are in os.environ --- kolibri/utils/options.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kolibri/utils/options.py b/kolibri/utils/options.py index ab1575845f..b990691955 100644 --- a/kolibri/utils/options.py +++ b/kolibri/utils/options.py @@ -827,6 +827,7 @@ def _set_from_envvars(conf): optname=optname, section=section ) ) + conf[section][optname] = os.environ[envvar] using_env_vars[optname] = envvar break return using_env_vars @@ -991,6 +992,12 @@ def generate_empty_options_file(ini_filename="options.ini"): conf = read_options_file(ini_filename=ini_filename) + for section, opts in option_spec.items(): + for optname, attrs in opts.items(): + for envvar in attrs.get("envvars", []): + if envvar in os.environ: + conf[section].pop(optname, None) + comments = None for section, opts in option_spec.items():