particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kojiapi: use DepsolvePackageSets instead of Depsolve

Browse source
This commit is contained in:
Tomas Hozza 2022-04-25 09:53:36 +02:00 • committed by Ondřej Budai
parent 694230b453
commit b92196a056
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/kojiapi/server.go
View file

@ -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)