File tree 1 file changed +5
-6
lines changed
arduino/cores/packagemanager
1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -469,20 +469,19 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
469
469
}
470
470
471
471
boardsTxtPath := platform .InstallDir .Join ("boards.txt" )
472
- boardsProperties , err := properties .LoadFromPath (boardsTxtPath )
472
+ allBoardsProperties , err := properties .LoadFromPath (boardsTxtPath )
473
473
if err != nil {
474
474
return err
475
475
}
476
476
477
477
boardsLocalTxtPath := platform .InstallDir .Join ("boards.local.txt" )
478
- if localProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
479
- boardsProperties .Merge (localProperties )
478
+ if boardsLocalProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
479
+ allBoardsProperties .Merge (boardsLocalProperties )
480
480
} else {
481
481
return err
482
482
}
483
483
484
- propertiesByBoard := boardsProperties .FirstLevelOf ()
485
-
484
+ propertiesByBoard := allBoardsProperties .FirstLevelOf ()
486
485
if menus , ok := propertiesByBoard ["menu" ]; ok {
487
486
platform .Menus = menus
488
487
} else {
@@ -495,7 +494,7 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
495
494
skippedBoards := []string {}
496
495
for boardID , boardProperties := range propertiesByBoard {
497
496
var board * cores.Board
498
- for key := range boardProperties .AsMap () {
497
+ for _ , key := range boardProperties .Keys () {
499
498
if ! strings .HasPrefix (key , "menu." ) {
500
499
continue
501
500
}
You can’t perform that action at this time.
0 commit comments