Skip to content

Fix loading platforms with malformed boards.txt #1326

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.

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

Merged
merged 7 commits into from
Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
[skip changelog] Fix some docs and comments
  • Loading branch information
silvanocerza committed Jun 18, 2021
commit 1106bb644c6677e5bb010587d8dd35b5cb26cd1f
6 changes: 3 additions & 3 deletions arduino/cores/packagemanager/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -395,18 +395,18 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
}
}
// The board's ID must be available in a board's properties since it can
// be used in all configuration files for several reasons, like settings compilation
// be used in all configuration files for several reasons, like setting compilation
// flags depending on the board id.
// For more info:
// https://arduino.github.io/arduino-cli/latest/platform-specification/#global-predefined-properties
// https://arduino.github.io/arduino-cli/dev/platform-specification/#global-predefined-properties
boardProperties.Set("_id", boardID)
board = platform.GetOrCreateBoard(boardID)
board.Properties.Merge(boardProperties)
next_board:
}

if len(skippedBoards) > 0 {
return fmt.Errorf("skip loading of boards %s: malformed custom board options", strings.Join(skippedBoards, ", "))
return fmt.Errorf("skipping loading of boards %s: malformed custom board options", strings.Join(skippedBoards, ", "))
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion test/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,6 @@ def test_core_with_wrong_custom_board_options_is_loaded(run_command, data_dir):
"Error initializing instance: "
+ "loading platform release arduino-beta-dev:platform_with_wrong_custom_board_options@4.2.0: "
+ "loading boards: "
+ "skip loading of boards arduino-beta-dev:platform_with_wrong_custom_board_options:nessuno: "
+ "skipping loading of boards arduino-beta-dev:platform_with_wrong_custom_board_options:nessuno: "
+ "malformed custom board options"
) in res.stderr
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy