Fixed weird error message in 'core install' if invalid platform is sp…

…ecified
arduino · Sep 11, 2023 · 28a7407 · 28a7407
1 parent 65915d8
commit 28a7407
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/arduino/errors.go b/arduino/errors.go
@@ -837,11 +837,8 @@ type MultiplePlatformsError struct {
 }
 
 func (e *MultiplePlatformsError) Error() string {
-	return tr("Found %d platform for reference \"%s\":\n%s",
-		len(e.Platforms),
-		e.UserPlatform,
-		strings.Join(e.Platforms, "\n"),
-	)
+	return tr("Found %d platforms matching \"%s\": %s",
+		len(e.Platforms), e.UserPlatform, strings.Join(e.Platforms, ", "))
 }
 
 // ToRPCStatus converts the error into a *status.Status

diff --git a/internal/cli/arguments/reference.go b/internal/cli/arguments/reference.go
@@ -116,11 +116,13 @@ func ParseReference(arg string) (*Reference, error) {
 	}
 	// replace the returned Reference only if only one occurrence is found,
 	// otherwise return an error to the user because we don't know on which platform operate
-	if len(foundPlatforms) == 1 {
-		ret.PackageName = toks[0]
-		ret.Architecture = toks[1]
-	} else {
+	if len(foundPlatforms) == 0 {
+		return nil, &arduino.PlatformNotFoundError{Platform: arg}
+	}
+	if len(foundPlatforms) > 1 {
 		return nil, &arduino.MultiplePlatformsError{Platforms: foundPlatforms, UserPlatform: arg}
 	}
+	ret.PackageName = toks[0]
+	ret.Architecture = toks[1]
 	return ret, nil
 }