summaryrefslogtreecommitdiff
path: root/searx/settings_loader.py
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2020-12-03 11:35:12 +0100
committerAlexandre Flament <alex@al-f.net>2020-12-03 11:35:12 +0100
commitd0d7a3e1c2d75fb0d9be3594ab113a804e4462a4 (patch)
tree9980b24421de0b12670b2ede2edc42a73ba6df42 /searx/settings_loader.py
parent89fbb85d454959be725cd4ca19c36c31d05d3289 (diff)
[fix] settings_loader: don't crash when a key exists only in the user settings
typical use case: result_proxy can be defined in the user settings, but are not defined the default settings.yml
Diffstat (limited to 'searx/settings_loader.py')
-rw-r--r--searx/settings_loader.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/searx/settings_loader.py b/searx/settings_loader.py
index 172069bd5..5dbeb4a9a 100644
--- a/searx/settings_loader.py
+++ b/searx/settings_loader.py
@@ -57,7 +57,10 @@ def update_settings(default_settings, user_settings):
# merge everything except the engines
for k, v in user_settings.items():
if k not in ('use_default_settings', 'engines'):
- update_dict(default_settings[k], v)
+ if k in default_settings:
+ update_dict(default_settings[k], v)
+ else:
+ default_settings[k] = v
# parse the engines
remove_engines = None