ericonr
/
sbctl
mirror of https://github.com/ericonr/sbctl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

generate-bundles: Return better error messages 

Current errors doesn't really give you any details what is failing if
there is a failure. This rearranges it a little bit

Signed-off-by: Morten Linderud <morten@linderud.pw>
This commit is contained in:
Morten Linderud 2021-06-05 14:34:54 +02:00
parent fb79c38977
commit 7e01fec4fa
No known key found for this signature in database
GPG Key ID: E742683BA08CB2FF
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/sbctl/generate-bundles.go
View File

@ -2,6 +2,7 @@ package main
import (
"errors"
"fmt"
"github.com/foxboron/sbctl"
"github.com/foxboron/sbctl/logging"
@ -19,10 +20,12 @@ var generateBundlesCmd = &cobra.Command{
logging.Println("Generating EFI bundles....")
out_create := true
out_sign := true
var out_err error
err := sbctl.BundleIter(func(bundle *sbctl.Bundle) error {
err := sbctl.CreateBundle(*bundle)
if err != nil {
out_create = false
out_err = fmt.Errorf("failed creating bundle %s: %w", bundle.Output, err)
return nil
}
logging.Print("Wrote EFI bundle %s\n", bundle.Output)
@ -33,19 +36,15 @@ var generateBundlesCmd = &cobra.Command{
logging.Unknown("Bundle has already been signed")
} else if err != nil {
out_sign = false
out_err = fmt.Errorf("failed signing bundle %s: %w", bundle.Output, err)
} else {
logging.Ok("Signed %s", file)
}
}
return nil
})
if !out_create {
return errors.New("error generating EFI bundles")
}
if !out_sign {
return errors.New("error signing EFI bundles")
if !out_create || !out_sign {
return out_err
}
if err != nil {
return err