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

osbuild-store-dump: use DepsolvePackageSets instead of Depsolve

Browse source
This commit is contained in:
Tomas Hozza 2022-04-25 09:53:36 +02:00 • committed by Ondřej Budai
parent 906e88ea8c
commit ac8b0b211c
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/osbuild-store-dump/main.go
View file

@ -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) { 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) packageSets := t.PackageSets(bp)
pkgSpecSets := make(map[string][]rpmmd.PackageSpec) pkgSpecSets, err := rpm_md.DepsolvePackageSets(
for name, packages := range packageSets { t.PackageSetsChains(),
pkgs, _, err := rpm_md.Depsolve(packages, repos, d.ModulePlatformID(), a.Name(), d.Releasever()) packageSets,
repos,
nil,
d.ModulePlatformID(),
a.Name(),
d.Releasever(),
)
if err != nil { if err != nil {
panic(err) panic("Could not depsolve: " + err.Error())
}
pkgSpecSets[name] = pkgs
} }
manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, 0) manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, 0)
if err != nil { if err != nil {