[skip-changelog] Handle errors that occur during reset (#2183)

arduino/serialutils/serialutils.go

@@ -131,8 +131,8 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun boo
 		if dryRun {
 			// do nothing!
 		} else {
-			if err := TouchSerialPortAt1200bps(portToTouch); err != nil {
-				fmt.Println(tr("TOUCH: error during reset: %s", err))
+			if err := TouchSerialPortAt1200bps(portToTouch); err != nil && !wait {
+				return "", errors.Errorf(tr("TOUCH: error during reset: %s", err))
 			}
 		}
 	}

commands/upload/upload.go

@@ -430,7 +430,7 @@ func runProgramAction(pme *packagemanager.Explorer,
 		}
 
 		if newPortAddress, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {
-			outStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))
+			errStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))
 		} else {
 			if newPortAddress != "" {
 				actualPort.Address = newPortAddress