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

Revert "Revert "Stabilize ordering graph""

Browse Source 
This reverts commit 2b23016a51.
This commit is contained in:
Ettore Di Giacinto
2020-11-02 15:43:35 +01:00
parent 2b23016a51
commit 102a788c91
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/solver/decoder.go
View File

@@ -163,7 +163,7 @@ func (assertions PackagesAssertions) Order(definitiondb pkg.PackageDatabase, fin
// Build a topological graph
for _, a := range unorderedAssertions {
currentPkg := a.Package
added := map[string]interface{}{}
added := map[string][]*pkg.DefaultPackage{}
REQUIRES:
for _, requiredDef := range currentPkg.GetRequires() {
if def, err := definitiondb.FindPackage(requiredDef); err == nil { // Provides: Get a chance of being override here
@@ -181,7 +181,16 @@ func (assertions PackagesAssertions) Order(definitiondb pkg.PackageDatabase, fin
}
// 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())
added[requiredDef.GetFingerPrint()] = nil
// The following is optional - it doesn't change the "correctness" of the solver results
// Here we add an extra edge between deps that share common dependendencies.
// This makes the link more stronger and balances the graph so it doesn't show
// different results for the same query, as they could be shuffled as don't have a direct connection.
for _, d := range added[currentPkg.GetFingerPrint()] {
graph.AddEdge(d.GetFingerPrint(), requiredDef.GetFingerPrint())
}
added[currentPkg.GetFingerPrint()] = append(added[currentPkg.GetFingerPrint()], requiredDef)
}
}
result, err := graph.TopSort(fingerprint)