diff --git a/script/merge_component_configs.py b/script/merge_component_configs.py index b17b8295e5..59ad0c5542 100755 --- a/script/merge_component_configs.py +++ b/script/merge_component_configs.py @@ -233,7 +233,7 @@ def merge_component_configs( del comp_data["packages"] # Prefix substitutions in component data - if "substitutions" in comp_data: + if "substitutions" in comp_data and comp_data["substitutions"] is not None: prefixed_subs = {} for sub_name, sub_value in comp_data["substitutions"].items(): prefixed_subs[f"{comp_name}_{sub_name}"] = sub_value