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

solver: skip same packages in the order and avoid loop

Browse Source
This commit is contained in:
Daniele Rondina
2020-05-04 12:21:49 +02:00
parent 1b529ea8c5
commit b68634b58a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/solver/decoder.go
View File

@@ -170,10 +170,10 @@ func (assertions PackagesAssertions) Order(definitiondb pkg.PackageDatabase, fin
sort.Sort(unorderedAssertions)
// Build a topological graph
//graph := toposort.NewGraph(len(unorderedAssertions))
// graph.AddNodes(fingerprints...)
added := map[string]map[string]interface{}{}
for _, a := range unorderedAssertions {
currentPkg := a.Package
REQUIRES:
for _, requiredDef := range currentPkg.GetRequires() {
if def, err := definitiondb.FindPackage(requiredDef); err == nil { // Provides: Get a chance of being override here
requiredDef = def.(*pkg.DefaultPackage)
@@ -185,9 +185,15 @@ func (assertions PackagesAssertions) Order(definitiondb pkg.PackageDatabase, fin
if req != nil {
requiredDef = req.Package
}
if _, ok := added[currentPkg.GetFingerPrint()][requiredDef.GetFingerPrint()]; ok {
continue REQUIRES
}
// Expand also here, as we need to order them (or instead the solver should give back the dep correctly?)
graph.AddEdge(currentPkg.GetFingerPrint(), requiredDef.GetFingerPrint())
if _, ok := added[currentPkg.GetFingerPrint()]; !ok {
added[currentPkg.GetFingerPrint()] = map[string]interface{}{}
}
added[currentPkg.GetFingerPrint()][requiredDef.GetFingerPrint()] = nil
}
}
result, err := graph.TopSort(fingerprint)