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

Expand also when ordering assertions

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-29 19:01:52 +01:00
parent 91b3daf180
commit d0c84d24a0
5 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/solver/decoder.go
View File

@@ -122,7 +122,7 @@ func (assertions PackagesAssertions) EnsureOrder() PackagesAssertions {
return orderedAssertions
}
func (assertions PackagesAssertions) Order(fingerprint string) PackagesAssertions {
func (assertions PackagesAssertions) Order(definitiondb pkg.PackageDatabase, fingerprint string) PackagesAssertions {
orderedAssertions := PackagesAssertions{}
unorderedAssertions := PackagesAssertions{}
@@ -145,12 +145,28 @@ func (assertions PackagesAssertions) Order(fingerprint string) PackagesAssertion
}
sort.Sort(unorderedAssertions)
w := definitiondb.World() // FIXME: this is heavy
// Build a topological graph
//graph := toposort.NewGraph(len(unorderedAssertions))
// graph.AddNodes(fingerprints...)
for _, a := range unorderedAssertions {
for _, req := range a.Package.GetRequires() {
for _, requiredDef := range a.Package.GetRequires() {
req, err := definitiondb.FindPackage(requiredDef)
if err != nil {
// return nil, errors.Wrap(err, "Couldn't find required package in db definition")
packages, err := requiredDef.Expand(&w)
// Info("Expanded", packages, err)
if err != nil || len(packages) == 0 {
req = requiredDef
} else {
req = pkg.Best(packages)
}
//required = &DefaultPackage{Name: "test"}
}
// Expand also here, as we need to order them (or instead the solver should give back the dep correctly?)
graph.AddEdge(a.Package.GetFingerPrint(), req.GetFingerPrint())
}
}