evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

10
homeassistant/bootstrap.py
View file

@ -113,15 +113,17 @@ def async_from_config_dict(config: Dict[str, Any],
yield from hass.async_add_job(loader.prepare, hass)
# Make a copy because we are mutating it.
new_config = OrderedDict()
for key, value in config.items():
new_config[key] = value or {}
config = new_config
config = OrderedDict(config)
# Merge packages
conf_util.merge_packages_config(
config, core_config.get(conf_util.CONF_PACKAGES, {}))
# Ensure we have no None values after merge
for key, value in config.items():
if not value:
config[key] = {}
hass.config_entries = config_entries.ConfigEntries(hass, config)
yield from hass.config_entries.async_load()