From 9c099f1337016f958fcccb157a46decca850945d Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 4 Mar 2017 15:24:24 +0100 Subject: [PATCH] Don't mangle release candidate version numbers --- cmd/ursrv/main.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go index 8537c420..93ebfebb 100644 --- a/cmd/ursrv/main.go +++ b/cmd/ursrv/main.go @@ -772,7 +772,7 @@ func ensureDir(dir string, mode int) { } } -var vRe = regexp.MustCompile(`^(v\d+\.\d+\.\d+(?:-[a-z]\w+)?)[+\.-]`) +var plusRe = regexp.MustCompile(`\+.*$`) // transformVersion returns a version number formatted correctly, with all // development versions aggregated into one. @@ -783,9 +783,7 @@ func transformVersion(v string) string { if !strings.HasPrefix(v, "v") { v = "v" + v } - if m := vRe.FindStringSubmatch(v); len(m) > 0 { - return m[1] + " (+dev)" - } + v = plusRe.ReplaceAllString(v, " (+dev)") return v }