github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #28932 from smarterclayton/fix_protobuf_error 

Automatic merge from submit-queue

Fail correctly in go-to-protobuf

We need to return earlier.

@wojtek-t
pull/6/head
k8s-merge-robot 2016-07-14 09:09:42 -07:00 committed by GitHub
parent 03be7117a4 c55f47c4c9
commit bea382c124
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View File

@ -179,13 +179,13 @@ func Run(g *Generator) {
}, },
"public", "public",
) )
c.Verify = g.Common.VerifyOnly
c.FileTypes["protoidl"] = NewProtoFile()
if err != nil { if err != nil {
log.Fatalf("Failed making a context: %v", err) log.Fatalf("Failed making a context: %v", err)
} }
c.Verify = g.Common.VerifyOnly
c.FileTypes["protoidl"] = NewProtoFile()
if err := protobufNames.AssignTypesToPackages(c); err != nil { if err := protobufNames.AssignTypesToPackages(c); err != nil {
log.Fatalf("Failed to identify Common types: %v", err) log.Fatalf("Failed to identify Common types: %v", err)
} }