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

TestDistro_Manifest: 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 e819e08098
commit 694230b453
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/distro/distro_test_common/distro_test_common.go
View file

@ -141,13 +141,17 @@ func getImageTypePkgSpecSets(imageType distro.ImageType, bp blueprint.Blueprint,
rpm_md := rpmmd.NewRPMMD(cacheDir)
imgPackageSpecSets := make(map[string][]rpmmd.PackageSpec)
for name, packages := range imgPackageSets {
packageSpecs, _, err := rpm_md.Depsolve(packages, repos, imageType.Arch().Distro().ModulePlatformID(), imageType.Arch().Name(), imageType.Arch().Distro().Releasever())
if err != nil {
panic("Could not depsolve: " + err.Error())
}
imgPackageSpecSets[name] = packageSpecs
imgPackageSpecSets, err := rpm_md.DepsolvePackageSets(
imageType.PackageSetsChains(),
imgPackageSets,
repos,
nil,
imageType.Arch().Distro().ModulePlatformID(),
imageType.Arch().Name(),
imageType.Arch().Distro().Releasever(),
)
if err != nil {
panic("Could not depsolve: " + err.Error())
}
return imgPackageSpecSets