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

osbuild-pipeline: 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 ef4db9edda
commit 906e88ea8c
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmd/osbuild-pipeline/main.go
View file

@ -117,8 +117,6 @@ func main() {
} }
} }
packageSets := imageType.PackageSets(composeRequest.Blueprint)
home, err := os.UserHomeDir() home, err := os.UserHomeDir()
if err != nil { if err != nil {
panic("os.UserHomeDir(): " + err.Error()) panic("os.UserHomeDir(): " + err.Error())
@ -126,13 +124,17 @@ func main() {
rpm_md := rpmmd.NewRPMMD(path.Join(home, ".cache/osbuild-composer/rpmmd")) rpm_md := rpmmd.NewRPMMD(path.Join(home, ".cache/osbuild-composer/rpmmd"))
packageSpecSets := make(map[string][]rpmmd.PackageSpec) packageSpecSets, err := rpm_md.DepsolvePackageSets(
for name, packages := range packageSets { imageType.PackageSetsChains(),
packageSpecs, _, err := rpm_md.Depsolve(packages, repos, d.ModulePlatformID(), arch.Name(), d.Releasever()) imageType.PackageSets(composeRequest.Blueprint),
if err != nil { repos,
panic("Could not depsolve: " + err.Error()) nil,
} d.ModulePlatformID(),
packageSpecSets[name] = packageSpecs arch.Name(),
d.Releasever(),
)
if err != nil {
panic("Could not depsolve: " + err.Error())
} }
var bytes []byte var bytes []byte