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

cmd: handle generated warnings during Manifest initialization

Browse source 
Signed-off-by: Irene Diez <idiez@redhat.com>
This commit is contained in:
Irene Diez 2023-03-08 12:56:34 +01:00 • committed by Tomáš Hozza
parent 20a5b25320
commit 47bb682221
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
err = fmt.Errorf("[%s] nil package specs", filename) err = fmt.Errorf("[%s] nil package specs", filename)
return return
} }
manifest, err := imgType.Manifest(cr.Blueprint.Customizations, options, repos, packageSpecs, containerSpecs, seedArg) manifest, _, err := imgType.Manifest(cr.Blueprint.Customizations, options, repos, packageSpecs, containerSpecs, seedArg)
if err != nil { if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err) err = fmt.Errorf("[%s] failed: %s", filename, err)
return return

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

@ -214,7 +214,7 @@ func main() {
composeRequest.OSTree.Ref = imageType.OSTreeRef() composeRequest.OSTree.Ref = imageType.OSTreeRef()
} }
manifest, err := imageType.Manifest(composeRequest.Blueprint.Customizations, manifest, _, err := imageType.Manifest(composeRequest.Blueprint.Customizations,
options, options,
repos, repos,
depsolvedSets, depsolvedSets,

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

@ -30,7 +30,7 @@ func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d di
} }
pkgSpecSets[name] = res pkgSpecSets[name] = res
} }
manifest, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, nil, 0) manifest, _, err := t.Manifest(bp.Customizations, distro.ImageOptions{}, repos, pkgSpecSets, nil, 0)
if err != nil { if err != nil {
panic(err) panic(err)
} }