From b92196a056779b746008cc83a8d05ccbf747ecbf Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 25 Apr 2022 09:53:36 +0200 Subject: [PATCH] kojiapi: use `DepsolvePackageSets` instead of `Depsolve` --- internal/kojiapi/server.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/internal/kojiapi/server.go b/internal/kojiapi/server.go index b49130730..e93c0c1c7 100644 --- a/internal/kojiapi/server.go +++ b/internal/kojiapi/server.go @@ -123,13 +123,17 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error { } packageSets := imageType.PackageSets(*bp) - packageSpecSets := make(map[string][]rpmmd.PackageSpec) - for name, packages := range packageSets { - packageSpecs, _, err := h.server.rpmMetadata.Depsolve(packages, repositories, d.ModulePlatformID(), arch.Name(), d.Releasever()) - if err != nil { - return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Failed to depsolve base base packages for %s/%s/%s: %s", ir.ImageType, ir.Architecture, request.Distribution, err)) - } - packageSpecSets[name] = packageSpecs + packageSpecSets, err := h.server.rpmMetadata.DepsolvePackageSets( + imageType.PackageSetsChains(), + packageSets, + repositories, + nil, + d.ModulePlatformID(), + arch.Name(), + d.Releasever(), + ) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Failed to depsolve base base packages for %s/%s/%s: %s", ir.ImageType, ir.Architecture, request.Distribution, err)) } manifest, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, repositories, packageSpecSets, manifestSeed)