aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMoritz Poldrack <git@moritz.sh>2022-07-29 22:31:54 +0200
committerRobin Jarry <robin@jarry.cc>2022-08-04 21:57:57 +0200
commit5ca6022d007bc83daba1e7297480d37f56554455 (patch)
treecc592d08276b7f0c8db6a4280bb7fb648b2548fe /config
parenta8d631177f4315810f0ab7c7d66d38e332ab0916 (diff)
downloadaerc-5ca6022d007bc83daba1e7297480d37f56554455.tar.gz
lint: ensure errors are at least logged (errcheck)
Signed-off-by: Moritz Poldrack <moritz@poldrack.dev> Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'config')
-rw-r--r--config/config.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/config.go b/config/config.go
index 249fa278..e87dccfc 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1042,7 +1042,10 @@ func (config AercConfig) mergeContextualUi(baseUi UIConfig,
continue
}
- mergo.Merge(&baseUi, contextualUi.UiConfig, mergo.WithOverride)
+ err := mergo.Merge(&baseUi, contextualUi.UiConfig, mergo.WithOverride)
+ if err != nil {
+ logging.Warnf("merge ui failed: %v", err)
+ }
if contextualUi.UiConfig.StyleSetName != "" {
baseUi.style = contextualUi.UiConfig.style
}