diff --git a/resolver.go b/resolver.go index 439e32d..5f2b5cb 100644 --- a/resolver.go +++ b/resolver.go @@ -103,7 +103,7 @@ func hashDependency[D Dependency](dep D) dependencyHash { } func (ar *Resolver[R, D]) resolve() Releases[R, D] { - debug("deps to process: %s", ar.depsToProcess) + debug("deps to process: %v", ar.depsToProcess) if len(ar.depsToProcess) == 0 { debug("All dependencies have been resolved.") var res Releases[R, D] @@ -121,7 +121,7 @@ func (ar *Resolver[R, D]) resolve() Releases[R, D] { // If a release is already picked in the solution check if it match the dep if existingRelease, has := ar.solution[depName]; has { if dep.GetConstraint().Match(existingRelease.GetVersion()) { - debug("%s already in solution and matching", existingRelease) + debug("%v already in solution and matching", existingRelease) oldDepsToProcess := ar.depsToProcess ar.depsToProcess = ar.depsToProcess[1:] if res := ar.resolve(); res != nil { @@ -130,7 +130,7 @@ func (ar *Resolver[R, D]) resolve() Releases[R, D] { ar.depsToProcess = oldDepsToProcess return nil } - debug("%s already in solution do not match... rollingback", existingRelease) + debug("%v already in solution do not match... rolling back", existingRelease) return nil } @@ -139,16 +139,16 @@ func (ar *Resolver[R, D]) resolve() Releases[R, D] { // Consider the latest versions first releases.SortDescent() - debug("releases matching criteria: %s", releases) + debug("releases matching criteria: %v", releases) backtracking_loop: for _, release := range releases { releaseDeps := release.GetDependencies() - debug("try with %s %s", release, releaseDeps) + debug("try with %v %v", release, releaseDeps) for _, releaseDep := range releaseDeps { if _, ok := ar.releases[releaseDep.GetName()]; !ok { - debug("%s did not work, becuase his dependency %s does not exists", release, releaseDep.GetName()) + debug("%v did not work, because its dependency %s does not exist", release, releaseDep.GetName()) continue backtracking_loop } } @@ -166,7 +166,7 @@ backtracking_loop: return res } ar.depsToProcess = oldDepsToProcess - debug("%s did not work...", release) + debug("%v did not work...", release) delete(ar.solution, depName) } diff --git a/resolver_test.go b/resolver_test.go index 778f55c..9af1086 100644 --- a/resolver_test.go +++ b/resolver_test.go @@ -123,7 +123,7 @@ func TestResolver(t *testing.T) { i160 := rel("I", "1.6.0", deps()) i170 := rel("I", "1.7.0", deps()) i180 := rel("I", "1.8.0", deps()) - arch := NewResolver[*customRel, *customDep]() + arch := NewResolver[*customRel]() arch.AddReleases( a100, a110, a111, a120, a121, b131, b130, b121, b120, b111, b110, b100,