From b8c62c3e8598adb3628a5cc49b2b595d97c38c1c Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Fri, 13 Dec 2019 23:37:44 +0100
Subject: [PATCH] Move selection logic to package BuildFormula()

---
 pkg/package/package.go    | 44 +++++++++++++++++++++++++++++++++++++--
 pkg/solver/solver_test.go | 33 +++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/pkg/package/package.go b/pkg/package/package.go
index d7dc685c..ef53a888 100644
--- a/pkg/package/package.go
+++ b/pkg/package/package.go
@@ -401,9 +401,49 @@ func (pack *DefaultPackage) BuildFormula(definitiondb PackageDatabase, db Packag
 
 	var formulas []bf.Formula
 	for _, requiredDef := range p.GetRequires() {
-		required, err := definitiondb.FindPackageCandidate(requiredDef)
+		required, err := definitiondb.FindPackage(requiredDef)
 		if err != nil {
-			return nil, errors.Wrap(err, "Couldn't find required package in db definition")
+			packages, err := requiredDef.Expand(definitiondb)
+			if err != nil || len(packages) == 0 {
+				required = requiredDef
+			} else {
+				if len(packages) == 1 {
+					required = packages[0]
+				} else {
+
+					var bb []bf.Formula
+					for _, o := range packages {
+						encodedB, err := o.Encode(db)
+						if err != nil {
+							return nil, err
+						}
+						B := bf.Var(encodedB)
+						bb = append(bb, B)
+						for _, i := range packages {
+							encodedI, err := i.Encode(db)
+							if err != nil {
+								return nil, err
+							}
+							I := bf.Var(encodedI)
+							if !o.Matches(i) {
+								//	formulas = append(formulas, bf.Or(I, B))
+								formulas = append(formulas, bf.Or(bf.Not(I), bf.Not(B)))
+
+								f, err := i.BuildFormula(definitiondb, db)
+								if err != nil {
+									return nil, err
+								}
+								formulas = append(formulas, f...)
+							}
+
+						}
+
+					}
+					//	formulas = append(formulas, bf.Or(bb...))
+
+					continue
+				}
+			}
 		}
 
 		encodedB, err := required.Encode(db)
diff --git a/pkg/solver/solver_test.go b/pkg/solver/solver_test.go
index c4966e7c..c474c35a 100644
--- a/pkg/solver/solver_test.go
+++ b/pkg/solver/solver_test.go
@@ -326,6 +326,39 @@ var _ = Describe("Solver", func() {
 			Expect(len(solution)).To(Equal(3))
 			Expect(err).ToNot(HaveOccurred())
 		})
+		It("Selects one version", func() {
+
+			E := pkg.NewPackage("E", "", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})
+			C := pkg.NewPackage("C", "", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})
+			D2 := pkg.NewPackage("D", "1.9", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})
+			D := pkg.NewPackage("D", "1.8", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})
+			D1 := pkg.NewPackage("D", "1.4", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})
+			B := pkg.NewPackage("B", "1.1", []*pkg.DefaultPackage{&pkg.DefaultPackage{Name: "D", Version: "1.4"}}, []*pkg.DefaultPackage{})
+			A := pkg.NewPackage("A", "", []*pkg.DefaultPackage{&pkg.DefaultPackage{Name: "D", Version: ">=1.0"}}, []*pkg.DefaultPackage{})
+
+			for _, p := range []pkg.Package{A, B, C, D, D1, D2, E} {
+				_, err := dbDefinitions.CreatePackage(p)
+				Expect(err).ToNot(HaveOccurred())
+			}
+
+			for _, p := range []pkg.Package{} {
+				_, err := dbInstalled.CreatePackage(p)
+				Expect(err).ToNot(HaveOccurred())
+			}
+			s = NewSolver(dbInstalled, dbDefinitions, db)
+
+			solution, err := s.Install([]pkg.Package{A, B})
+			Expect(solution).To(ContainElement(PackageAssert{Package: A, Value: true}))
+			Expect(solution).To(ContainElement(PackageAssert{Package: B, Value: true}))
+			Expect(solution).To(ContainElement(PackageAssert{Package: D1, Value: true}))
+			Expect(solution).ToNot(ContainElement(PackageAssert{Package: D, Value: true}))
+			Expect(solution).ToNot(ContainElement(PackageAssert{Package: D2, Value: true}))
+			Expect(solution).To(ContainElement(PackageAssert{Package: D, Value: false}))
+			Expect(solution).To(ContainElement(PackageAssert{Package: D2, Value: false}))
+
+			Expect(len(solution)).To(Equal(5))
+			Expect(err).ToNot(HaveOccurred())
+		})
 		It("Uninstalls simple package correctly", func() {
 
 			C := pkg.NewPackage("C", "", []*pkg.DefaultPackage{}, []*pkg.DefaultPackage{})