kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-07-18 17:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Walk requires in ExpandedRevdeps

Browse Source 
In this way we annotate the visited and we avoid cycles that can be
generated by revdeps
This commit is contained in:
Ettore Di Giacinto 2020-04-23 23:44:42 +02:00
parent ec32677dc1
commit 8305d01e76
No known key found for this signature in database
GPG Key ID: 1ADA699B145A2D1C
2 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/package/package.go
View File

@ -47,7 +47,7 @@ type Package interface {
Requires([]*DefaultPackage) Package Requires([]*DefaultPackage) Package
Conflicts([]*DefaultPackage) Package Conflicts([]*DefaultPackage) Package
Revdeps(PackageDatabase) Packages Revdeps(PackageDatabase) Packages
ExpandedRevdeps(definitiondb PackageDatabase) Packages ExpandedRevdeps(definitiondb PackageDatabase, visited map[string]interface{}) Packages
LabelDeps(PackageDatabase, string) Packages LabelDeps(PackageDatabase, string) Packages
GetProvides() []*DefaultPackage GetProvides() []*DefaultPackage
@ -419,20 +419,38 @@ func (p *DefaultPackage) Revdeps(definitiondb PackageDatabase) Packages {
// ExpandedRevdeps returns the package reverse dependencies, // ExpandedRevdeps returns the package reverse dependencies,
// matching also selectors in versions (>, <, >=, <=) // matching also selectors in versions (>, <, >=, <=)
func (p *DefaultPackage) ExpandedRevdeps(definitiondb PackageDatabase) Packages { func (p *DefaultPackage) ExpandedRevdeps(definitiondb PackageDatabase, visited map[string]interface{}) Packages {
var versionsInWorld Packages var versionsInWorld Packages
if _, ok := visited[p.HumanReadableString()]; ok {
return versionsInWorld
}
for _, w := range definitiondb.World() { for _, w := range definitiondb.World() {
if w.Matches(p) { if w.Matches(p) {
continue continue
} }
// for _, re := range w.GetRequires() { match := false
if ok, _ := w.RequiresContains(definitiondb, p); ok {
versionsInWorld = append(versionsInWorld, w)
versionsInWorld = append(versionsInWorld, w.ExpandedRevdeps(definitiondb)...)
}
//}
}
for _, re := range w.GetRequires() {
if re.Matches(p) {
match = true
}
if !match {
}
packages, _ := re.Expand(definitiondb)
for _, pa := range packages {
if pa.Matches(p) {
match = true
}
}
}
if match {
versionsInWorld = append(versionsInWorld, w)
versionsInWorld = append(versionsInWorld, w.ExpandedRevdeps(definitiondb, visited)...)
visited[w.HumanReadableString()] = true
}
}
return versionsInWorld.Unique() return versionsInWorld.Unique()
} }

31
pkg/package/package_test.go
View File

@ -189,7 +189,8 @@ var _ = Describe("Package", func() {
_, err := definitions.CreatePackage(p) _, err := definitions.CreatePackage(p)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
} }
lst := a.ExpandedRevdeps(definitions) visited := make(map[string]interface{})
lst := a.ExpandedRevdeps(definitions, visited)
Expect(lst).To(ContainElement(c)) Expect(lst).To(ContainElement(c))
Expect(lst).To(ContainElement(d)) Expect(lst).To(ContainElement(d))
Expect(lst).To(ContainElement(e)) Expect(lst).To(ContainElement(e))
@ -210,7 +211,33 @@ var _ = Describe("Package", func() {
_, err := definitions.CreatePackage(p) _, err := definitions.CreatePackage(p)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
} }
lst := a.ExpandedRevdeps(definitions) visited := make(map[string]interface{})
lst := a.ExpandedRevdeps(definitions, visited)
Expect(lst).To(ContainElement(b))
Expect(lst).To(ContainElement(c))
Expect(lst).To(ContainElement(d))
Expect(lst).To(ContainElement(e))
Expect(len(lst)).To(Equal(4))
})
})
Context("Expandedrevdeps", func() {
a := NewPackage("A", "1.0", []*DefaultPackage{}, []*DefaultPackage{})
b := NewPackage("B", "1.0", []*DefaultPackage{&DefaultPackage{Name: "A", Version: ">=1.0"}}, []*DefaultPackage{})
c := NewPackage("C", "1.1", []*DefaultPackage{&DefaultPackage{Name: "B", Version: ">=1.0"}, &DefaultPackage{Name: "A", Version: ">=0"}}, []*DefaultPackage{})
d := NewPackage("D", "0.1", []*DefaultPackage{&DefaultPackage{Name: "C", Version: ">=1.0"}}, []*DefaultPackage{})
e := NewPackage("E", "0.1", []*DefaultPackage{&DefaultPackage{Name: "C", Version: ">=1.0"}}, []*DefaultPackage{})
It("Computes correctly", func() {
definitions := NewInMemoryDatabase(false)
for _, p := range []Package{a, b, c, d, e} {
_, err := definitions.CreatePackage(p)
Expect(err).ToNot(HaveOccurred())
}
visited := make(map[string]interface{})
lst := a.ExpandedRevdeps(definitions, visited)
Expect(lst).To(ContainElement(b)) Expect(lst).To(ContainElement(b))
Expect(lst).To(ContainElement(c)) Expect(lst).To(ContainElement(c))
Expect(lst).To(ContainElement(d)) Expect(lst).To(ContainElement(d))