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

osbuild2: check v1 data before converting

Browse source 
Don't convert stage results if there are none.

Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
Achilleas Koutsou 2021-09-07 16:51:01 +02:00 • committed by Ondřej Budai
parent 6731984326
commit b7bab25e73
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
internal/osbuild2/result.go
View file

@ -168,26 +168,32 @@ func (res *Result) fromV1(resv1 osbuild1.Result) {
metadata := make(map[string]PipelineMetadata)
// make build pipeline from build result
buildResult, buildMetadata := convertStageResults(resv1.Build.Stages)
log["build"] = buildResult
if len(buildMetadata) > 0 {
metadata["build"] = buildMetadata
if resv1.Build != nil {
buildResult, buildMetadata := convertStageResults(resv1.Build.Stages)
log["build"] = buildResult
if len(buildMetadata) > 0 {
metadata["build"] = buildMetadata
}
}
// make assembler pipeline from assembler result
assemblerResult, assemblerMetadata := convertStageResult(resv1.Assembler)
log["assembler"] = []StageResult{*assemblerResult}
if assemblerMetadata != nil {
metadata["assembler"] = map[string]StageMetadata{
resv1.Assembler.Name: assemblerMetadata,
if resv1.Assembler != nil {
assemblerResult, assemblerMetadata := convertStageResult(resv1.Assembler)
log["assembler"] = []StageResult{*assemblerResult}
if assemblerMetadata != nil {
metadata["assembler"] = map[string]StageMetadata{
resv1.Assembler.Name: assemblerMetadata,
}
}
}
// make os pipeline from main stage results
osResult, osMetadata := convertStageResults(resv1.Stages)
log["os"] = osResult
if len(buildMetadata) > 0 {
metadata["os"] = osMetadata
if len(resv1.Stages) > 0 {
osResult, osMetadata := convertStageResults(resv1.Stages)
log["os"] = osResult
if len(osMetadata) > 0 {
metadata["os"] = osMetadata
}
}
res.Log = log