Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed weird error message in core install if invalid platform is spcified #2309

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Fixed weird error message in core install if invalid platform is spcified #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28a7407
Fixed weird error message in 'core install' if invalid platform is sp…
cmaglie Sep 11, 2023
8c55dd5
Fixed integration test
cmaglie Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions arduino/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions internal/cli/arguments/reference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion internal/integrationtest/core/core_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ func TestCoreDownloadMultiplePlatforms(t *testing.T) {
// The cli should not allow it since optimizing the casing results in finding two cores
_, stderr, err := cli.Run("core", "upgrade", "Packager:Arch")
require.Error(t, err)
require.Contains(t, string(stderr), "Invalid argument passed: Found 2 platform for reference")
require.Contains(t, string(stderr), "Invalid argument passed: Found 2 platforms matching")
}

func TestCoreWithMissingCustomBoardOptionsIsLoaded(t *testing.T) {
Expand Down