perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't consider prereleases for -upgrade (fixes #436)

Browse Source
This commit is contained in:
Jakob Borg 2014-07-24 12:55:41 +02:00
parent 3640c3b66a
commit b676264fca
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/upgrade_common.go
View File

@ -7,9 +7,9 @@ import (
) )
type githubRelease struct { type githubRelease struct {
Tag string `json:"tag_name"` Tag string `json:"tag_name"`
Prelease bool `json:"prerelease"` Prerelease bool `json:"prerelease"`
Assets []githubAsset `json:"assets"` Assets []githubAsset `json:"assets"`
} }
type githubAsset struct { type githubAsset struct {

11
cmd/syncthing/upgrade_supported.go
View File

@ -84,7 +84,7 @@ func upgrade() error {
} }
func currentRelease() (githubRelease, error) { func currentRelease() (githubRelease, error) {
resp, err := http.Get("https://api.github.com/repos/calmh/syncthing/releases?per_page=1") resp, err := http.Get("https://api.github.com/repos/calmh/syncthing/releases?per_page=10")
if err != nil { if err != nil {
return githubRelease{}, err return githubRelease{}, err
} }
@ -93,10 +93,13 @@ func currentRelease() (githubRelease, error) {
json.NewDecoder(resp.Body).Decode(&rels) json.NewDecoder(resp.Body).Decode(&rels)
resp.Body.Close() resp.Body.Close()
if len(rels) != 1 { for _, rel := range rels {
return githubRelease{}, fmt.Errorf("Unexpected number of releases: %d", len(rels)) if !rel.Prerelease {
return rel, nil
}
} }
return rels[0], nil
return githubRelease{}, errors.New("no suitable release found")
} }
func readTarGZ(url string, dir string) (string, error) { func readTarGZ(url string, dir string) (string, error) {