Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to Env Var and Config persisting in options.ini in KOLIBRI_HOME #11737

Merged
merged 3 commits into from
Jan 19, 2024
+6 −0
Merged

Fix to Env Var and Config persisting in options.ini in KOLIBRI_HOME #11737

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
556de59
override the configuration to default false
thesujai Jan 17, 2024
1e6a08b
remove conf overriding in _set_from_envvars
thesujai Jan 17, 2024
505cacb
remove envvar from conf that are in os.environ
thesujai Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions kolibri/utils/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,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():
Expand Down