From ac8b0b211c51237369ea1e497b53888e043e747b Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Mon, 25 Apr 2022 09:53:36 +0200
Subject: [PATCH] osbuild-store-dump: use `DepsolvePackageSets` instead of
 `Depsolve`

---
 cmd/osbuild-store-dump/main.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/cmd/osbuild-store-dump/main.go b/cmd/osbuild-store-dump/main.go
index f4912fb31..ba5a9a315 100644
--- a/cmd/osbuild-store-dump/main.go
+++ b/cmd/osbuild-store-dump/main.go
@@ -19,13 +19,17 @@ import (
 
 func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d distro.Distro, rpm_md rpmmd.RPMMD, repos []rpmmd.RepoConfig) (distro.Manifest, []rpmmd.PackageSpec) {
 	packageSets := t.PackageSets(bp)
-	pkgSpecSets := make(map[string][]rpmmd.PackageSpec)
-	for name, packages := range packageSets {
-		pkgs, _, err := rpm_md.Depsolve(packages, repos, d.ModulePlatformID(), a.Name(), d.Releasever())
-		if err != nil {
-			panic(err)
-		}
-		pkgSpecSets[name] = pkgs
+	pkgSpecSets, err := rpm_md.DepsolvePackageSets(
+		t.PackageSetsChains(),
+		packageSets,
+		repos,
+		nil,
+		d.ModulePlatformID(),
+		a.Name(),
+		d.Releasever(),
+	)
+	if err != nil {
+		panic("Could not depsolve: " + err.Error())
 	}
 	manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, 0)
 	if err != nil {