Fixing merge conflicts in auto-update server.

xiam · xiam · commit 1ce3b90b83e5 · 2015-07-05T09:11:10.000-05:00
diff --git a/src/github.com/getlantern/autoupdate-server/server/github.go b/src/github.com/getlantern/autoupdate-server/server/github.go
@@ -124,7 +124,7 @@ func (g *ReleaseManager) getReleases() ([]Release, error) {
 
 		for i := range rels {
 			version := *rels[i].TagName
-			v, err := semver.New(version)
+			v, err := semver.Parse(version)
 			if err != nil {
 				log.Debugf("Release %q is not semantically versioned (%q). Skipping.", version, err)
 				continue
diff --git a/src/github.com/getlantern/autoupdate-server/server/server.go b/src/github.com/getlantern/autoupdate-server/server/server.go
@@ -91,7 +91,7 @@ func (g *ReleaseManager) CheckForUpdate(p *Params) (res *Result, err error) {
 		}
 	}
 
-	appVersion, err := semver.New(p.AppVersion)
+	appVersion, err := semver.Parse(p.AppVersion)
 	if err != nil {
 		return nil, fmt.Errorf("Bad version string: %v", err)
 	}
diff --git a/src/github.com/getlantern/autoupdate-server/server/signature.go b/src/github.com/getlantern/autoupdate-server/server/signature.go
@@ -8,9 +8,10 @@ import (
 	"encoding/hex"
 	"encoding/pem"
 	"fmt"
-	"github.com/getlantern/go-update"
 	"io/ioutil"
 	"os"
+
+	"github.com/getlantern/go-update"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func (g ReleaseManager) CheckForUpdate(p Params) (res *Result, err error) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- appVersion, err := semver.New(p.AppVersion)`
	`94`	`+ appVersion, err := semver.Parse(p.AppVersion)`
`95`	`95`	`if err != nil {`
`96`	`96`	`return nil, fmt.Errorf("Bad version string: %v", err)`
`97`	`97`	`}`