vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 03:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix version comparison

Browse source
This commit is contained in:
Daniel 2019-08-02 14:50:16 +02:00
parent 23f3f06cf1
commit a410e27fa4
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Gopkg.lock generated
View file

@ -83,6 +83,14 @@
revision = "f0e32980c006571efd537032e5f9cd8c1a92819e" revision = "f0e32980c006571efd537032e5f9cd8c1a92819e"
version = "v0.1.0" version = "v0.1.0"
[[projects]]
digest = "1:88e0b0baeb9072f0a4afbcf12dda615fc8be001d1802357538591155998da21b"
name = "github.com/hashicorp/go-version"
packages = ["."]
pruneopts = "UT"
revision = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"
version = "v1.2.0"
[[projects]] [[projects]]
digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
name = "github.com/inconshreveable/mousetrap" name = "github.com/inconshreveable/mousetrap"
@ -239,6 +247,7 @@
"github.com/google/gopacket/layers", "github.com/google/gopacket/layers",
"github.com/google/gopacket/tcpassembly", "github.com/google/gopacket/tcpassembly",
"github.com/google/renameio", "github.com/google/renameio",
"github.com/hashicorp/go-version",
"github.com/miekg/dns", "github.com/miekg/dns",
"github.com/oschwald/maxminddb-golang", "github.com/oschwald/maxminddb-golang",
"github.com/satori/go.uuid", "github.com/satori/go.uuid",

4
Gopkg.toml
View file

@ -97,3 +97,7 @@ ignored = ["github.com/safing/portbase/*"]
[prune] [prune]
go-tests = true go-tests = true
unused-packages = true unused-packages = true
[[constraint]]
name = "github.com/hashicorp/go-version"
version = "1.2.0"

29
updates/latest.go
View file

@ -11,6 +11,8 @@ import (
"sync" "sync"
"github.com/safing/portbase/log" "github.com/safing/portbase/log"
semver "github.com/hashicorp/go-version"
) )
var ( var (
@ -70,11 +72,11 @@ func ScanForLatest(baseDir string, hardFail bool) (latest map[string]string, las
filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error { filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
lastError = err lastError = fmt.Errorf("updates: could not read %s: %s", path, err)
if hardFail { if hardFail {
return err return lastError
} }
log.Warningf("updates: could not read %s", path) log.Warning(lastError.Error())
} }
return nil return nil
} }
@ -95,9 +97,24 @@ func ScanForLatest(baseDir string, hardFail bool) (latest map[string]string, las
// add/update index // add/update index
storedVersion, ok := latest[identifierPath] storedVersion, ok := latest[identifierPath]
if ok { if ok {
// FIXME: this will fail on multi-digit version segments! parsedVersion, err := semver.NewVersion(version)
// FIXME: use https://github.com/hashicorp/go-version if err != nil {
if version > storedVersion { lastError = fmt.Errorf("updates: could not parse version of %s: %s", path, err)
if hardFail {
return lastError
}
log.Warning(lastError.Error())
}
parsedStoredVersion, err := semver.NewVersion(storedVersion)
if err != nil {
lastError = fmt.Errorf("updates: could not parse version of %s: %s", path, err)
if hardFail {
return lastError
}
log.Warning(lastError.Error())
}
// compare
if parsedVersion.GreaterThan(parsedStoredVersion) {
latest[identifierPath] = version latest[identifierPath] = version
} }
} else { } else {