usnistgov/macos_security
1
0
Fork 0
mirror of https://github.com/usnistgov/macos_security.git synced 2026-09-26 21:30:42 +01:00
Code Issues 21 Actions Packages Projects Releases Wiki Activity

Merge pull request #811 from brodjieski/fix_issue_808

Browse Source 
Fix deep_merge behavior for preferred key
This commit is contained in:
Bob Gendler
2026-09-18 11:59:59 -04:00
committed by GitHub
parent 7cae9c5ec8 a7e19dd73f
commit 6d6ade78fc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mscp/classes/macsecurityrule.py
View File

@@ -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:
@@ -317,7 +317,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