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

gen-manifests: set default ref before resolving packages

Browse source 
Package collection reads options and customizations to determine which
build packages to pull, so we must set the default ref early if it's
needed.
This commit is contained in:
Achilleas Koutsou 2022-11-08 18:23:33 +01:00 • committed by Christian Kellner
parent 09903bd0db
commit e192cc4a18
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,11 +137,15 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
}
containerSpecs, err := resolveContainers(bp.Containers, archName)
if err != nil {
return fmt.Errorf("[%s] container resolution failed: %s", filename, err.Error())
}
if options.OSTree.ImageRef == "" {
// use default OSTreeRef for image type
options.OSTree.ImageRef = imgType.OSTreeRef()
}
packageSpecs, err := depsolve(cacheDir, imgType, bp, options, repos, distribution, archName)
if err != nil {
err = fmt.Errorf("[%s] depsolve failed: %s", filename, err.Error())
@ -151,10 +155,6 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
err = fmt.Errorf("[%s] nil package specs", filename)
return
}
if options.OSTree.ImageRef == "" {
// use default OSTreeRef for image type
options.OSTree.ImageRef = imgType.OSTreeRef()
}
manifest, err := imgType.Manifest(cr.Blueprint.Customizations, options, repos, packageSpecs, containerSpecs, seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)