From a7f0dd74c0be59e66161fff10f2c52b16d9915e5 Mon Sep 17 00:00:00 2001 From: Dan Brodjieski Date: Thu, 17 Sep 2026 08:24:51 -0400 Subject: [PATCH] fix: correct the deep_merge behavior for preferred key Issue #808 --- src/mscp/classes/macsecurityrule.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mscp/classes/macsecurityrule.py b/src/mscp/classes/macsecurityrule.py index cefa3c5c..95693473 100644 --- a/src/mscp/classes/macsecurityrule.py +++ b/src/mscp/classes/macsecurityrule.py @@ -41,7 +41,7 @@ def deep_merge(a, b, preferred_key=None): for key, value in b.items(): if key == preferred_key: a[key] = value - return a + continue if key in a and isinstance(a[key], dict) and isinstance(value, dict): deep_merge(a[key], value, preferred_key) else: @@ -284,7 +284,9 @@ class Macsecurityrule(BaseModelWithAccessors): continue if custom_rule_key == "platforms": platform_info = rule_yaml.get("platforms") - deep_merge(platform_info, custom_rule_value, preferred_key="result") + deep_merge( + platform_info, custom_rule_value, preferred_key="result" + ) continue rule_yaml[custom_rule_key] = custom_rule_value