Merge pull request #825 from harshavardhana/simplify

Simplify version parsing with newVersion() make it more robust
master
Harshavardhana 9 years ago
commit ba6ddd5924
  1. 24
      verify-runtime.go

@ -49,20 +49,20 @@ type version struct {
} }
func newVersion(v string) version { func newVersion(v string) version {
var ver version ver := version{}
verSlice := strings.Split(v, ".") verSlice := strings.Split(v, ".")
if len(verSlice) > 2 { if len(verSlice) < 2 {
ver = version{ Fatalln("Version string missing major and minor versions, cannot proceed exiting.")
major: verSlice[0],
minor: verSlice[1],
patch: verSlice[2],
}
return ver
} }
ver = version{ if len(verSlice) > 3 {
major: verSlice[0], Fatalf("Unknown Version style format, newVersion only supports ‘major.minor.patch’ not ‘%s’.\n", v)
minor: verSlice[1], }
patch: "0", ver.major = verSlice[0]
ver.minor = verSlice[1]
if len(verSlice) == 3 {
ver.patch = verSlice[2]
} else {
ver.patch = "0"
} }
return ver return ver
} }

Loading…
Cancel
Save