zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for mergeing dictionary bug

Browse Source 
This was not working with admin users
This commit is contained in:
yuvipanda
2018-07-01 11:54:26 -07:00
parent 1bc19ad0a7
commit aab0f8e036
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tljh/configurer.py
View File

@@ -37,7 +37,8 @@ default = {
def apply_yaml_config(path, c): def apply_yaml_config(path, c):
if os.path.exists(path): if os.path.exists(path):
with open(path) as f: 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: else:
tljh_config = copy.deepcopy(default) tljh_config = copy.deepcopy(default)