jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we have valid config AFTER merging packages #13015 (#13038)

Browse Source 
* Ensure we have valid config AFTER merging packages #13015

* also fix packages
This commit is contained in:
Johann Kellerman
2018-03-10 20:02:04 +02:00
committed by Paulus Schoutsen
parent 7ea7fc8d38
commit 40485a6e89
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/config.py
View File

@@ -562,6 +562,9 @@ def merge_packages_config(config, packages, _log_pkg_error=_log_pkg_error):
continue
if merge_type == 'dict':
if comp_conf is None:
comp_conf = OrderedDict()
if not isinstance(comp_conf, dict):
_log_pkg_error(
pack_name, comp_name, config,