rp2040load: do not exit if sketch upload fails

cmaglie · cmaglie · commit 462e6d39d5ec · 2021-05-10T12:32:35.000+02:00
diff --git a/programmers/rp2040load/rp2040load.go b/programmers/rp2040load/rp2040load.go
@@ -9,6 +9,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/serialutils"
 	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/go-paths-helper"
+	"github.com/pkg/errors"
 )
 
 type RP2040Load struct {
@@ -32,7 +33,7 @@ func (b *RP2040Load) Flash(filename string, cb *serialutils.ResetProgressCallbac
 
 	log.Println("Flashing " + filename)
 	if err := b.invoke("-v", "-D", filename); err != nil {
-		log.Fatalf("Error flashing %s: %s", filename, err)
+		return errors.Errorf("Error flashing %s: %s", filename, err)
 	}
 
 	time.Sleep(5 * time.Second)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"github.com/arduino/arduino-cli/arduino/serialutils"`
`10`	`10`	`"github.com/arduino/arduino-cli/executils"`
`11`	`11`	`"github.com/arduino/go-paths-helper"`
	`12`	`+ "github.com/pkg/errors"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`type RP2040Load struct {`
`@@ -32,7 +33,7 @@ func (b RP2040Load) Flash(filename string, cb serialutils.ResetProgressCallbac`
`32`	`33`
`33`	`34`	`log.Println("Flashing " + filename)`
`34`	`35`	`if err := b.invoke("-v", "-D", filename); err != nil {`
`35`		`- log.Fatalf("Error flashing %s: %s", filename, err)`
	`36`	`+ return errors.Errorf("Error flashing %s: %s", filename, err)`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`time.Sleep(5 * time.Second)`