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

Merge pull request #28932 from smarterclayton/fix_protobuf_error
bea382c1 · k8s-merge-robot · GitHub · 03be7117 · c55f47c4 · bea382c1
Commit bea382c1 authored Jul 14, 2016 by k8s-merge-robot Committed by GitHub Jul 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cmd.go cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +3 -3

No files found.
--- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
+++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
@@ -179,13 +179,13 @@ func Run(g *Generator) {
 		},
 		"public",
 	)
-	c.Verify = g.Common.VerifyOnly
-	c.FileTypes["protoidl"] = NewProtoFile()
-
 	if err != nil {
 		log.Fatalf("Failed making a context: %v", err)
 	}

+	c.Verify = g.Common.VerifyOnly
+	c.FileTypes["protoidl"] = NewProtoFile()
+
 	if err := protobufNames.AssignTypesToPackages(c); err != nil {
 		log.Fatalf("Failed to identify Common types: %v", err)
 	}