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

cloudapi: fix manifestSource.Serialize()

Browse source
This commit is contained in:
Michael Vogt 2025-01-20 13:42:21 +01:00 • committed by Tomáš Hozza
parent 145f8e9f8a
commit a6ba0785b0
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/cloudapi/v2/server.go
View file

@ -24,6 +24,7 @@ import (
"github.com/osbuild/images/pkg/container"
"github.com/osbuild/images/pkg/distrofactory"
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/manifest"
"github.com/osbuild/images/pkg/ostree"
"github.com/osbuild/images/pkg/reporegistry"
@ -664,7 +665,19 @@ func serializeManifest(ctx context.Context, manifestSource *manifest.Manifest, w
}
}
ms, err := manifestSource.Serialize(depsolveResults.PackageSpecs, containerSpecs, ostreeCommitSpecs, depsolveResults.RepoConfigs)
// XXX: fix worker.DepsolveJobResult
depsolveResultsInTheRightFormat := map[string]dnfjson.DepsolveResult{}
for plName, res := range depsolveResults.PackageSpecs {
r := depsolveResultsInTheRightFormat[plName]
r.Packages = res
depsolveResultsInTheRightFormat[plName] = r
}
for plName, res := range depsolveResults.RepoConfigs {
r := depsolveResultsInTheRightFormat[plName]
r.Repos = res
depsolveResultsInTheRightFormat[plName] = r
}
ms, err := manifestSource.Serialize(depsolveResultsInTheRightFormat, containerSpecs, ostreeCommitSpecs, nil)
if err != nil {
reason := "Error serializing manifest"
jobResult.JobError = clienterrors.New(clienterrors.ErrorManifestGeneration, reason, nil)