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

Merge pull request #1378 from Zillode/draft-upgrade

Browse Source 
Do not consider draft releases or releases with emtpy assets
This commit is contained in:
Jakob Borg
2015-04-01 11:03:13 +02:00
parent e1757ee726 d6030b8d68
commit 6459d11d32
5 changed files with 3895 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/syncthing/gui.go
View File

@@ -618,7 +618,7 @@ func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
http.Error(w, upgrade.ErrUpgradeUnsupported.Error(), 500)
return
}
rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
rel, err := upgrade.LatestGithubRelease(Version)
if err != nil {
http.Error(w, err.Error(), 500)
return
@@ -660,7 +660,7 @@ func restGetLang(w http.ResponseWriter, r *http.Request) {
}
func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
rel, err := upgrade.LatestGithubRelease(Version)
if err != nil {
l.Warnln("getting latest release:", err)
http.Error(w, err.Error(), 500)

8
cmd/syncthing/main.go
View File

@@ -50,7 +50,6 @@ var (
BuildHost = "unknown"
BuildUser = "unknown"
IsRelease bool
IsBeta bool
LongVersion string
)
@@ -79,9 +78,6 @@ func init() {
exp := regexp.MustCompile(`^v\d+\.\d+\.\d+(-beta[\d\.]+)?$`)
IsRelease = exp.MatchString(Version)
// Check for a beta build
IsBeta = strings.Contains(Version, "-beta")
stamp, _ := strconv.Atoi(BuildStamp)
BuildDate = time.Unix(int64(stamp), 0)
@@ -327,7 +323,7 @@ func main() {
}
if doUpgrade || doUpgradeCheck {
rel, err := upgrade.LatestRelease(IsBeta)
rel, err := upgrade.LatestGithubRelease(Version)
if err != nil {
l.Fatalln("Upgrade:", err) // exits 1
}
@@ -999,7 +995,7 @@ func autoUpgrade() {
case <-timer.C:
}
rel, err := upgrade.LatestRelease(IsBeta)
rel, err := upgrade.LatestGithubRelease(Version)
if err == upgrade.ErrUpgradeUnsupported {
events.Default.Unsubscribe(sub)
return