kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-01 15:18:28 +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

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))
})
})