From 8424e39f0ec6fdb9a1c2b1766321fc9b63efae26 Mon Sep 17 00:00:00 2001 From: Guerdon Mukama Date: Mon, 22 Jan 2024 14:59:26 +1100 Subject: [PATCH] update merge script --- helm/fence/scripts/yaml_merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/fence/scripts/yaml_merge.py b/helm/fence/scripts/yaml_merge.py index eeee1e31..5223f9f4 100644 --- a/helm/fence/scripts/yaml_merge.py +++ b/helm/fence/scripts/yaml_merge.py @@ -24,7 +24,7 @@ def merge_yaml_files(file_paths): return merged_data def merge_dicts(dict1, dict2): - if dict2 is not None: + if dict2 is not None: #Fix AttributeError for key, value in dict2.items(): if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict): dict1[key] = merge_dicts(dict1[key], value)