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

Expand conflicts #14

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-20 21:36:58 +01:00
parent 6cf6c2104d
commit d134690560
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/tree/tree.go
View File

@@ -158,16 +158,19 @@ func (gb *DefaultTree) updatePackage(p pkg.Package) error {
continue continue
} }
s := solver.NewSolver([]pkg.Package{}, []pkg.Package{}, gb.GetPackageSet()) confs := []*pkg.DefaultPackage{}
best := s.Best(packages) for _, c := range packages {
found, ok := best.(*pkg.DefaultPackage) found, ok := c.(*pkg.DefaultPackage)
if !ok { if !ok {
return errors.New("Simpleparser should deal only with DefaultPackages") return errors.New("Simpleparser should deal only with DefaultPackages")
}
confs = append(confs, found)
} }
p.GetConflicts()[i] = found p.Conflicts(append(p.GetConflicts(), confs...))
} }
} }
Debug("💫 Finished processing", p.GetName()) // Debug("💫 Finished processing", p.GetName())
if err := gb.GetPackageSet().UpdatePackage(p); err != nil { if err := gb.GetPackageSet().UpdatePackage(p); err != nil {
return err return err