pkg/networks/config.go: fix overwriting non-nil err

AkihiroSuda · AkihiroSuda · commit a26f5cf08aaf · 2024-05-04T12:28:01.000+09:00
Non-nil `cache.err` was overwritten

Fix issue 2313

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/pkg/networks/config.go b/pkg/networks/config.go
@@ -135,6 +135,7 @@ func loadCache() {
 		cache.err = yaml.UnmarshalWithOptions(b, &cache.config, yaml.Strict())
 		if cache.err != nil {
 			cache.err = fmt.Errorf("cannot parse %q: %w", configFile, cache.err)
+			return
 		}
 		cache.config, cache.err = fillDefaults(cache.config)
 		if cache.err != nil {

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ func loadCache() {`
`135`	`135`	`cache.err = yaml.UnmarshalWithOptions(b, &cache.config, yaml.Strict())`
`136`	`136`	`if cache.err != nil {`
`137`	`137`	`cache.err = fmt.Errorf("cannot parse %q: %w", configFile, cache.err)`
	`138`	`+ return`
`138`	`139`	`}`
`139`	`140`	`cache.config, cache.err = fillDefaults(cache.config)`
`140`	`141`	`if cache.err != nil {`