Skip to content

K
k3s
Commit bea382c1 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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
parents 03be7117 c55f47c4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View file @ bea382c1
...@@ -179,13 +179,13 @@ func Run(g *Generator) { ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment