sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-11 15:52:20 +01:00
Code Issues Releases Wiki Activity

Perform merges when substituting dict keys (#3062)

Browse Source
This commit is contained in:
Joshua Spence
2022-01-25 09:46:42 +11:00
committed by GitHub
parent 6ff3942e8b
commit 28b65cb810
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
esphome/components/packages/__init__.py
View File

@@ -1,6 +1,7 @@
import re
from pathlib import Path
from esphome.core import EsphomeError
from esphome.config_helpers import merge_config
from esphome import git, yaml_util
from esphome.const import (
@@ -18,26 +19,6 @@ import esphome.config_validation as cv
DOMAIN = CONF_PACKAGES
def _merge_package(full_old, full_new):
def merge(old, new):
# pylint: disable=no-else-return
if isinstance(new, dict):
if not isinstance(old, dict):
return new
res = old.copy()
for k, v in new.items():
res[k] = merge(old[k], v) if k in old else v
return res
elif isinstance(new, list):
if not isinstance(old, list):
return new
return old + new
return new
return merge(full_old, full_new)
def validate_git_package(config: dict):
new_config = config
for key, conf in config.items():
@@ -167,7 +148,7 @@ def do_packages_pass(config: dict):
package_config = _process_base_package(package_config)
if isinstance(package_config, dict):
recursive_package = do_packages_pass(package_config)
config = _merge_package(recursive_package, config)
config = merge_config(recursive_package, config)
del config[CONF_PACKAGES]
return config