From 024070b6b87ff0ff0e6bc9f0073f2626aa15251a Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Wed, 8 Jan 2025 18:17:13 +0100 Subject: [PATCH] entry --- .../valuemergehandler/handlers/simplelistmerge/handler.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/ocm/valuemergehandler/handlers/simplelistmerge/handler.go b/api/ocm/valuemergehandler/handlers/simplelistmerge/handler.go index 4129661b0..397bf4c53 100644 --- a/api/ocm/valuemergehandler/handlers/simplelistmerge/handler.go +++ b/api/ocm/valuemergehandler/handlers/simplelistmerge/handler.go @@ -45,13 +45,13 @@ outer: return modified, nil } -func equal(c *Config, le, te Entry) bool { +func equal(c *Config, le, entry Entry) bool { if c == nil || len(c.IgnoredFields) == 0 { - return reflect.DeepEqual(le, te) + return reflect.DeepEqual(le, entry) } if lm, ok := le.(map[string]interface{}); ok { - if tm, ok := te.(map[string]interface{}); ok { + if tm, ok := entry.(map[string]interface{}); ok { for _, n := range c.IgnoredFields { delete(lm, n) delete(tm, n) @@ -59,5 +59,5 @@ func equal(c *Config, le, te Entry) bool { return reflect.DeepEqual(lm, tm) } } - return reflect.DeepEqual(le, te) + return reflect.DeepEqual(le, entry) }