Handling conflict

Author: rjtokenring

command/ota/cancel.go

@@ -21,6 +21,15 @@ func CancelOta(otaid string, cred *config.Credentials) error {
 		if err != nil {
 			return err
 		}
+		// No error, get current status
+		res, err := otapi.GetOtaStatusByOtaID(otaid, 1, otaapi.OrderDesc)
+		if err != nil {
+			return err
+		}
+		if res != nil {
+			feedback.PrintResult(res.Ota)
+		}
+		return nil
 	}
 
 	return nil

internal/ota-api/client.go

@@ -38,6 +38,7 @@ const (
 )
 
 var ErrAlreadyInProgress = fmt.Errorf("already in progress")
+var ErrAlreadyCancelled = fmt.Errorf("already cancelled")
 
 type OtaApiClient struct {
 	client       *http.Client
@@ -236,7 +237,7 @@ func (c *OtaApiClient) CancelOta(otaid string) (bool, error) {
 	} else if res.StatusCode == 404 || res.StatusCode == 400 {
 		return false, fmt.Errorf("ota-id %s not found", otaid)
 	} else if res.StatusCode == 409 {
-		return false, ErrAlreadyInProgress
+		return false, ErrAlreadyCancelled
 	}
 
 	return false, err