ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vendor: github.com/hashicorp/go-version

This commit is contained in:
Jaka Hudoklin 2017-12-11 17:46:25 +01:00
parent c729bdff43
commit fd687a5b9e
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vendor/github.com/hashicorp/go-version/version.go generated vendored
View File

@ -15,8 +15,8 @@ var versionRegexp *regexp.Regexp
// The raw regular expression string used for testing the validity // The raw regular expression string used for testing the validity
// of a version. // of a version.
const VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` + const VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` +
`(-?([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` + `(-?([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` +
`(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` + `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` +
`?` `?`
// Version represents a single version. // Version represents a single version.
@ -166,24 +166,42 @@ func comparePart(preSelf string, preOther string) int {
return 0 return 0
} }
var selfInt int64
selfNumeric := true
selfInt, err := strconv.ParseInt(preSelf, 10, 64)
if err != nil {
selfNumeric = false
}
var otherInt int64
otherNumeric := true
otherInt, err = strconv.ParseInt(preOther, 10, 64)
if err != nil {
otherNumeric = false
}
// if a part is empty, we use the other to decide // if a part is empty, we use the other to decide
if preSelf == "" { if preSelf == "" {
_, notIsNumeric := strconv.ParseInt(preOther, 10, 64) if otherNumeric {
if notIsNumeric == nil {
return -1 return -1
} }
return 1 return 1
} }
if preOther == "" { if preOther == "" {
_, notIsNumeric := strconv.ParseInt(preSelf, 10, 64) if selfNumeric {
if notIsNumeric == nil {
return 1 return 1
} }
return -1 return -1
} }
if preSelf > preOther { if selfNumeric && !otherNumeric {
return -1
} else if !selfNumeric && otherNumeric {
return 1
} else if !selfNumeric && !otherNumeric && preSelf > preOther {
return 1
} else if selfInt > otherInt {
return 1 return 1
} }

6
vendor/vendor.json vendored
View File

@ -1521,10 +1521,10 @@
"revision": "36289988d83ca270bc07c234c36f364b0dd9c9a7" "revision": "36289988d83ca270bc07c234c36f364b0dd9c9a7"
}, },
{ {
"checksumSHA1": "EcZfls6vcqjasWV/nBlu+C+EFmc=", "checksumSHA1": "9w1ZtxhdB/J0qqNPJQNNI/ZTwwE=",
"path": "github.com/hashicorp/go-version", "path": "github.com/hashicorp/go-version",
"revision": "e96d3840402619007766590ecea8dd7af1292276", "revision": "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee",
"revisionTime": "2016-10-31T18:26:05Z" "revisionTime": "2017-11-29T15:08:20Z"
}, },
{ {
"checksumSHA1": "o3XZZdOnSnwQSpYw215QV75ZDeI=", "checksumSHA1": "o3XZZdOnSnwQSpYw215QV75ZDeI=",