felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Allow major upgrade (fixes #1680)

Browse Source
This commit is contained in:
Jakob Borg
2015-04-22 21:22:16 +09:00
parent 3cc4cb0a0b
commit bf959a77e2
5 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/syncthing/gui.go
+3 -2
View File
@@ -626,7 +626,8 @@ func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
res := make(map[string]interface{})
res["running"] = Version
res["latest"] = rel.Tag
res["newer"] = upgrade.CompareVersions(rel.Tag, Version) == 1
res["newer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.Newer
res["majorNewer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.MajorNewer
w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(res)
@@ -667,7 +668,7 @@ func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
return
}
if upgrade.CompareVersions(rel.Tag, Version) == 1 {
if upgrade.CompareVersions(rel.Tag, Version) > upgrade.Equal {
err = upgrade.To(rel)
if err != nil {
l.Warnln("upgrading:", err)