Merge pull request #28686 from smarterclayton/name_check_wrong

Automatic merge from submit-queue

Name check for go-to-protobuf in wrong spot

@thockin this can land after your change, but is wrong today.
This commit is contained in:
k8s-merge-robot
2016-07-09 03:38:21 -07:00
committed by GitHub

View File

@@ -125,9 +125,6 @@ func Run(g *Generator) {
protobufNames := NewProtobufNamer()
outputPackages := generator.Packages{}
for _, d := range strings.Split(g.Packages, ",") {
if strings.Contains(d, "-") {
log.Fatalf("Package names must be valid protobuf package identifiers, which allow only [a-z0-9_]: %s", d)
}
generateAllTypes, outputPackage := true, true
switch {
case strings.HasPrefix(d, "+"):
@@ -137,6 +134,9 @@ func Run(g *Generator) {
d = d[1:]
outputPackage = false
}
if strings.Contains(d, "-") {
log.Fatalf("Package names must be valid protobuf package identifiers, which allow only [a-z0-9_]: %s", d)
}
name := protoSafePackage(d)
parts := strings.SplitN(d, "=", 2)
if len(parts) > 1 {