From aab0f8e036e754e09d7df97166854c85a486d064 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Sun, 1 Jul 2018 11:54:26 -0700 Subject: [PATCH] Temporary fix for mergeing dictionary bug This was not working with admin users --- tljh/configurer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tljh/configurer.py b/tljh/configurer.py index c16cad4..954f185 100644 --- a/tljh/configurer.py +++ b/tljh/configurer.py @@ -37,7 +37,8 @@ default = { def apply_yaml_config(path, c): if os.path.exists(path): with open(path) as f: - tljh_config = _merge_dictionaries(default, yaml.safe_load(f)) + # FIXME: Figure out correct order of merging here + tljh_config = _merge_dictionaries(yaml.safe_load(f), default) else: tljh_config = copy.deepcopy(default)