genall.Runtime.Run: Make sure we don't ignore returned errors

LukeShu · LukeShu · commit 0afacab104c2 · 2020-08-31T23:34:14.000-06:00
diff --git a/pkg/genall/genall.go b/pkg/genall/genall.go
@@ -165,14 +165,16 @@ func (r *Runtime) Run() bool {
 		return true
 	}
 
+	hadErrs := false
 	for _, gen := range r.Generators {
 		ctx := r.GenerationContext // make a shallow copy
 		ctx.OutputRule = r.OutputRules.ForGenerator(gen)
 		if err := (*gen).Generate(&ctx); err != nil {
 			fmt.Fprintln(os.Stderr, err)
+			hadErrs = true
 		}
 	}
 
 	// skip TypeErrors -- they're probably just from partial typechecking in crd-gen
-	return loader.PrintErrors(r.Roots, packages.TypeError)
+	return loader.PrintErrors(r.Roots, packages.TypeError) || hadErrs
 }

Original file line number	Diff line number	Diff line change
`@@ -165,14 +165,16 @@ func (r *Runtime) Run() bool {`
`165`	`165`	`return true`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ hadErrs := false`
`168`	`169`	`for _, gen := range r.Generators {`
`169`	`170`	`ctx := r.GenerationContext // make a shallow copy`
`170`	`171`	`ctx.OutputRule = r.OutputRules.ForGenerator(gen)`
`171`	`172`	`if err := (*gen).Generate(&ctx); err != nil {`
`172`	`173`	`fmt.Fprintln(os.Stderr, err)`
	`174`	`+ hadErrs = true`
`173`	`175`	`}`
`174`	`176`	`}`
`175`	`177`
`176`	`178`	`// skip TypeErrors -- they're probably just from partial typechecking in crd-gen`
`177`		`- return loader.PrintErrors(r.Roots, packages.TypeError)`
	`179`	`+ return loader.PrintErrors(r.Roots, packages.TypeError) \|\| hadErrs`
`178`	`180`	`}`