From 145f8e9f8a63fe7a4673d28542b87dc3ec2db059 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@gmail.com>
Date: Mon, 20 Jan 2025 13:02:44 +0100
Subject: [PATCH] osbuild-store-dump: port to new images API

---
 cmd/osbuild-store-dump/main.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd/osbuild-store-dump/main.go b/cmd/osbuild-store-dump/main.go
index 2e3cbfeb7..85e3b9a90 100644
--- a/cmd/osbuild-store-dump/main.go
+++ b/cmd/osbuild-store-dump/main.go
@@ -29,24 +29,22 @@ func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d di
 	if err != nil {
 		panic(err)
 	}
-	pkgSpecSets := make(map[string][]rpmmd.PackageSpec)
-	repoConfigs := make(map[string][]rpmmd.RepoConfig)
+	depsolved := make(map[string]dnfjson.DepsolveResult)
 	solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), a.Name(), d.Name(), cacheDir)
 	for name, packages := range manifest.GetPackageSetChains() {
 		res, err := solver.Depsolve(packages, sbom.StandardTypeNone)
 		if err != nil {
 			panic(err)
 		}
-		pkgSpecSets[name] = res.Packages
-		repoConfigs[name] = res.Repos
+		depsolved[name] = *res
 	}
 
-	mf, err := manifest.Serialize(pkgSpecSets, nil, nil, repoConfigs)
+	mf, err := manifest.Serialize(depsolved, nil, nil, nil)
 	if err != nil {
 		panic(err)
 	}
 
-	return mf, pkgSpecSets["packages"]
+	return mf, depsolved["packages"].Packages
 }
 
 func main() {