remove envvar from conf that are in os.environ

learningequality · Jan 18, 2024 · 505cacb · 505cacb
1 parent 1e6a08b
commit 505cacb
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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():