status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #680 from sequenceiq/fix-version-check 

fixing version numbers RCs should be labeled x.x.x-rcx
This commit is contained in:
Ryan Uber 2015-02-09 00:08:59 -08:00
parent ad484dc625 190f15458f
commit ebee060dcd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/command.go
View File

@ -357,9 +357,13 @@ func (c *Command) setupAgent(config *Config, logOutput io.Writer, logWriter *log
// Setup update checking // Setup update checking
if !config.DisableUpdateCheck { if !config.DisableUpdateCheck {
version := config.Version
if config.VersionPrerelease != "" {
version += fmt.Sprintf("-%s", config.VersionPrerelease)
}
updateParams := &checkpoint.CheckParams{ updateParams := &checkpoint.CheckParams{
Product: "consul", Product: "consul",
Version: fmt.Sprintf("%s%s", config.Version, config.VersionPrerelease), Version: version,
} }
if !config.DisableAnonymousSignature { if !config.DisableAnonymousSignature {
updateParams.SignatureFile = filepath.Join(config.DataDir, "checkpoint-signature") updateParams.SignatureFile = filepath.Join(config.DataDir, "checkpoint-signature")