Commit d174e40

committed

Handle errors that occur during reset

1 parent d9d740d commit d174e40Copy full SHA for d174e40

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun boo`
`132`	`132`	`// do nothing!`
`133`	`133`	`} else {`
`134`	`134`	`if err := TouchSerialPortAt1200bps(portToTouch); err != nil {`
`135`		`- fmt.Println(tr("TOUCH: error during reset: %s", err))`
	`135`	`+ return"", errors.Errorf(tr("TOUCH: error during reset: %s", err))`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func runProgramAction(pme *packagemanager.Explorer,`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`if newPortAddress, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {`
`433`		`- outStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))`
	`433`	`+ errStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))`
`434`	`434`	`} else {`
`435`	`435`	`if newPortAddress != "" {`
`436`	`436`	`actualPort.Address = newPortAddress`

Comments

(0)