Merge pull request #520 from q384566678/nil-fix

Ma Shimiao · web-flow · commit 7d57b315eeac · 2017-11-17T14:22:41.000+08:00
generate: fix error return
diff --git a/generate/generate.go b/generate/generate.go
@@ -233,6 +233,7 @@ func NewFromFile(path string) (Generator, error) {
 		if os.IsNotExist(err) {
 			return Generator{}, fmt.Errorf("template configuration at %s not found", path)
 		}
+		return Generator{}, err
 	}
 	defer cf.Close()
 

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ func NewFromFile(path string) (Generator, error) {`
`233`	`233`	`if os.IsNotExist(err) {`
`234`	`234`	`return Generator{}, fmt.Errorf("template configuration at %s not found", path)`
`235`	`235`	`}`
	`236`	`+ return Generator{}, err`
`236`	`237`	`}`
`237`	`238`	`defer cf.Close()`
`238`	`239`