kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-02 07:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt package.Best to take a Versioner interface

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-04-04 15:33:14 +02:00
parent aaa8d8b7d6
commit 84625be9ac
6 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/package/database_boltdb.go
View File

@@ -338,7 +338,7 @@ func (db *BoltDatabase) FindPackageCandidate(p Package) (Package, error) {
if err != nil || len(packages) == 0 {
required = p
} else {
required = packages.Best()
required = packages.Best(nil)
}
return required, nil

2
pkg/package/database_mem.go
View File

@@ -349,7 +349,7 @@ func (db *InMemoryDatabase) FindPackageCandidate(p Package) (Package, error) {
if err != nil || len(packages) == 0 {
required = p
} else {
required = packages.Best()
required = packages.Best(nil)
}
return required, nil

29
pkg/package/package.go
View File

@@ -23,15 +23,14 @@ import (
"io"
"path/filepath"
"regexp"
"sort"
"strconv"
"strings"
gentoo "github.com/Sabayon/pkgs-checker/pkg/gentoo"
"github.com/crillab/gophersat/bf"
"github.com/ghodss/yaml"
version "github.com/hashicorp/go-version"
"github.com/jinzhu/copier"
version "github.com/mudler/luet/pkg/versioner"
"github.com/pkg/errors"
)
@@ -460,7 +459,13 @@ func (pack *DefaultPackage) RequiresContains(definitiondb PackageDatabase, s Pac
return false, nil
}
func (set Packages) Best() Package {
// Best returns the best version of the package (the most bigger) from a list
// Accepts a versioner interface to change the ordering policy. If null is supplied
// It defaults to version.WrappedVersioner which supports both semver and debian versioning
func (set Packages) Best(v version.Versioner) Package {
if v == nil {
v = &version.WrappedVersioner{}
}
var versionsMap map[string]Package = make(map[string]Package)
if len(set) == 0 {
panic("Best needs a list with elements")
@@ -468,22 +473,12 @@ func (set Packages) Best() Package {
versionsRaw := []string{}
for _, p := range set {
// TODO: This is temporary!.
sanitizedVersion := strings.ReplaceAll(p.GetVersion(), "_", "-")
versionsRaw = append(versionsRaw, sanitizedVersion)
versionsMap[sanitizedVersion] = p
versionsRaw = append(versionsRaw, p.GetVersion())
versionsMap[p.GetVersion()] = p
}
sorted := v.Sort(versionsRaw)
versions := make([]*version.Version, len(versionsRaw))
for i, raw := range versionsRaw {
v, _ := version.NewVersion(raw)
versions[i] = v
}
// After this, the versions are properly sorted
sort.Sort(version.Collection(versions))
return versionsMap[versions[len(versions)-1].Original()]
return versionsMap[sorted[len(sorted)-1]]
}
func (pack *DefaultPackage) BuildFormula(definitiondb PackageDatabase, db PackageDatabase) ([]bf.Formula, error) {

2
pkg/package/package_test.go
View File

@@ -58,7 +58,7 @@ var _ = Describe("Package", func() {
Expect(lst).To(ContainElement(a1))
Expect(lst).ToNot(ContainElement(a01))
Expect(len(lst)).To(Equal(2))
p := lst.Best()
p := lst.Best(nil)
Expect(p).To(Equal(a11))
})
})

6
pkg/solver/solver.go
View File

@@ -141,7 +141,7 @@ func (s *Solver) getList(db pkg.PackageDatabase, lsp pkg.Packages) (pkg.Packages
if err != nil || len(packages) == 0 {
cp = pp
} else {
cp = packages.Best()
cp = packages.Best(nil)
}
}
ls = append(ls, cp)
@@ -229,7 +229,7 @@ func (s *Solver) Upgrade(checkconflicts bool) (pkg.Packages, PackagesAssertions,
installedcopy.CreatePackage(p)
packages, ok := availableCache[p.GetName()+p.GetCategory()]
if ok && len(packages) != 0 {
best := packages.Best()
best := packages.Best(nil)
if best.GetVersion() != p.GetVersion() {
toUninstall = append(toUninstall, p)
toInstall = append(toInstall, best)
@@ -272,7 +272,7 @@ func (s *Solver) Uninstall(c pkg.Package, checkconflicts bool) (pkg.Packages, er
if err != nil || len(packages) == 0 {
candidate = c
} else {
candidate = packages.Best()
candidate = packages.Best(nil)
}
//Relax search, otherwise we cannot compute solutions for packages not in definitions
// return nil, errors.Wrap(err, "Package not found between installed")

2
pkg/solver/solver_test.go
View File

@@ -882,7 +882,7 @@ var _ = Describe("Solver", func() {
Expect(lst).To(ContainElement(a03))
Expect(lst).ToNot(ContainElement(old))
Expect(len(lst)).To(Equal(5))
p := lst.Best()
p := lst.Best(nil)
Expect(p).To(Equal(a03))
})
})