github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix SPN intel updates

Browse Source
This commit is contained in:
Daniel
2025-04-15 11:26:59 +02:00
parent 846646c7e9
commit 9801aae3e7
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service/updates/index.go
View File

@@ -241,7 +241,10 @@ func (index *Index) ShouldUpgradeTo(newIndex *Index) error {
return nil
case index.Name != newIndex.Name:
return errors.New("new index name does not match")
return fmt.Errorf(
"new index name (%q) does not match current index name (%q)",
newIndex.Name, index.Name,
)
case index.isLocallyGenerated:
if newIndex.versionNum.GreaterThan(index.versionNum) {

3
service/updates/module.go
View File

@@ -18,7 +18,6 @@ import (
"github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/base/notifications"
"github.com/safing/portmaster/base/utils"
"github.com/safing/portmaster/service/configure"
"github.com/safing/portmaster/service/mgr"
"github.com/safing/portmaster/service/ui"
)
@@ -203,7 +202,7 @@ func New(instance instance, name string, cfg Config) (*Updater, error) {
module.corruptedInstallation = fmt.Errorf("invalid index: %w", err)
}
index, err = GenerateIndexFromDir(cfg.Directory, IndexScanConfig{
Name: configure.DefaultBinaryIndexName,
Name: cfg.Name,
Version: info.VersionNumber(),
})
if err == nil && index.init(currentPlatform) == nil {