From da6f5ba70166c009f60e6f960a8c1c8c151e82e1 Mon Sep 17 00:00:00 2001 From: Jacob Kozol Date: Wed, 6 Jan 2021 13:14:25 -0500 Subject: [PATCH] kojiapi,cloudapi: exclude packages when depsolving When rpmmd's Depsolve function is called we need to pass in the image type's excluded packages. These excluded packages are retrieved when we get the packages we include from each image type. --- internal/cloudapi/server.go | 4 ++-- internal/kojiapi/server.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cloudapi/server.go b/internal/cloudapi/server.go index 1dbcb08ad..5afb21595 100644 --- a/internal/cloudapi/server.go +++ b/internal/cloudapi/server.go @@ -125,8 +125,8 @@ func (server *Server) Compose(w http.ResponseWriter, r *http.Request) { return } - packageSpecs, _ := imageType.Packages(bp) - packages, _, err := server.rpmMetadata.Depsolve(packageSpecs, nil, repositories, distribution.ModulePlatformID(), arch.Name()) + packageSpecs, excludePackageSpecs := imageType.Packages(bp) + packages, _, err := server.rpmMetadata.Depsolve(packageSpecs, excludePackageSpecs, repositories, distribution.ModulePlatformID(), arch.Name()) if err != nil { http.Error(w, fmt.Sprintf("Failed to depsolve base packages for %s/%s/%s: %s", ir.ImageType, ir.Architecture, request.Distribution, err), http.StatusInternalServerError) return diff --git a/internal/kojiapi/server.go b/internal/kojiapi/server.go index 2a68d4ce6..daec0f280 100644 --- a/internal/kojiapi/server.go +++ b/internal/kojiapi/server.go @@ -118,8 +118,8 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error { if err != nil { panic("Could not initialize empty blueprint.") } - packageSpecs, _ := imageType.Packages(*bp) - packages, _, err := h.server.rpmMetadata.Depsolve(packageSpecs, nil, repositories, d.ModulePlatformID(), arch.Name()) + packageSpecs, excludePackageSpecs := imageType.Packages(*bp) + packages, _, err := h.server.rpmMetadata.Depsolve(packageSpecs, excludePackageSpecs, repositories, d.ModulePlatformID(), arch.Name()) 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)) }