From 906e88ea8ce348e2b9a607371ef3bea10dde6a95 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 25 Apr 2022 09:53:36 +0200 Subject: [PATCH] osbuild-pipeline: use `DepsolvePackageSets` instead of `Depsolve` --- cmd/osbuild-pipeline/main.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/osbuild-pipeline/main.go b/cmd/osbuild-pipeline/main.go index f51aa33a6..1933b4260 100644 --- a/cmd/osbuild-pipeline/main.go +++ b/cmd/osbuild-pipeline/main.go @@ -117,8 +117,6 @@ func main() { } } - packageSets := imageType.PackageSets(composeRequest.Blueprint) - home, err := os.UserHomeDir() if err != nil { panic("os.UserHomeDir(): " + err.Error()) @@ -126,13 +124,17 @@ func main() { rpm_md := rpmmd.NewRPMMD(path.Join(home, ".cache/osbuild-composer/rpmmd")) - packageSpecSets := make(map[string][]rpmmd.PackageSpec) - for name, packages := range packageSets { - packageSpecs, _, err := rpm_md.Depsolve(packages, repos, d.ModulePlatformID(), arch.Name(), d.Releasever()) - if err != nil { - panic("Could not depsolve: " + err.Error()) - } - packageSpecSets[name] = packageSpecs + packageSpecSets, err := rpm_md.DepsolvePackageSets( + imageType.PackageSetsChains(), + imageType.PackageSets(composeRequest.Blueprint), + repos, + nil, + d.ModulePlatformID(), + arch.Name(), + d.Releasever(), + ) + if err != nil { + panic("Could not depsolve: " + err.Error()) } var bytes []byte