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

distro: remove packageSpecSets and containers from Manifest() args

Browse source 
The arguments aren't used in the function anymore.
This commit is contained in:
Achilleas Koutsou 2023-05-16 01:15:36 +02:00 • committed by Simon de Vlieger
parent d5d7fb4b31
commit 3b1d48ec99
24 changed files with 72 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/gen-manifests/main.go
View file

@ -156,7 +156,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
bp = blueprint.Blueprint(*cr.Blueprint)
}
manifest, _, err := imgType.Manifest(&bp, options, repos, nil, nil, seedArg)
manifest, _, err := imgType.Manifest(&bp, options, repos, seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)
return

4
cmd/osbuild-dnf-json-tests/main_test.go
View file

@ -63,7 +63,7 @@ func TestCrossArchDepsolve(t *testing.T) {
FetchChecksum: "baz",
},
},
repos[archStr], nil, nil, 0)
repos[archStr], 0)
assert.NoError(t, err)
for _, set := range manifest.Content.PackageSets {
@ -101,7 +101,7 @@ func TestDepsolvePackageSets(t *testing.T) {
qcow2Image, err := x86Arch.GetImageType(qcow2ImageTypeName)
require.Nilf(t, err, "failed to get %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), platform.ARCH_X86_64.String())
manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, nil, nil, 0)
manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, 0)
require.Nilf(t, err, "failed to initialise manifest for %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), platform.ARCH_X86_64.String())
imagePkgSets := manifestSource.Content.PackageSets

5
cmd/osbuild-package-sets/main.go
View file

@ -48,13 +48,14 @@ func main() {
encoder := json.NewEncoder(os.Stdout)
encoder.SetIndent("", " ")
manifest, _, err := image.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{
options := distro.ImageOptions{
OSTree: &ostree.ImageOptions{
URL: "foo",
ImageRef: "bar",
FetchChecksum: "baz",
},
}, nil, nil, nil, 0)
}
manifest, _, err := image.Manifest(&blueprint.Blueprint{}, options, nil, 0)
if err != nil {
panic(err)
}

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

@ -200,12 +200,7 @@ func main() {
// let the cache grow to fit much more repository metadata than we usually allow
solver.SetMaxCacheSize(3 * 1024 * 1024 * 1024)
manifest, _, err := imageType.Manifest(&composeRequest.Blueprint,
options,
repos,
nil,
nil,
seedArg)
manifest, _, err := imageType.Manifest(&composeRequest.Blueprint, options, repos, seedArg)
if err != nil {
panic(err.Error())
}

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

@ -22,7 +22,7 @@ import (
)
func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d distro.Distro, cacheDir string, repos []rpmmd.RepoConfig) (manifest.OSBuildManifest, []rpmmd.PackageSpec) {
manifest, _, err := t.Manifest(&bp, distro.ImageOptions{}, repos, nil, nil, 0)
manifest, _, err := t.Manifest(&bp, distro.ImageOptions{}, repos, 0)
if err != nil {
panic(err)
}