File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed
arduino/cores/packagemanager Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -458,27 +458,27 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
458458 }
459459
460460 boardsTxtPath := platform .InstallDir .Join ("boards.txt" )
461- boardsProperties , err := properties .LoadFromPath (boardsTxtPath )
461+ allBoardsProperties , err := properties .LoadFromPath (boardsTxtPath )
462462 if err != nil {
463463 return err
464464 }
465465
466466 boardsLocalTxtPath := platform .InstallDir .Join ("boards.local.txt" )
467- if localProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
468- boardsProperties .Merge (localProperties )
467+ if boardsLocalProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
468+ allBoardsProperties .Merge (boardsLocalProperties )
469469 } else {
470470 return err
471471 }
472472
473- platform .Menus = boardsProperties .SubTree ("menu" )
473+ platform .Menus = allBoardsProperties .SubTree ("menu" )
474474
475475 // Build to boards structure following the boards.txt board ordering
476- for _ , boardID := range boardsProperties .FirstLevelKeys () {
476+ for _ , boardID := range allBoardsProperties .FirstLevelKeys () {
477477 if boardID == "menu" {
478478 // This is not a board id so we remove it to correctly set all other boards properties
479479 continue
480480 }
481- boardProperties := boardsProperties .SubTree (boardID )
481+ boardProperties := allBoardsProperties .SubTree (boardID )
482482 var board * cores.Board
483483 if ! platform .PluggableDiscoveryAware {
484484 convertVidPidIdentificationPropertiesToPluggableDiscovery (boardProperties )
You can’t perform that action at this time.
0 commit comments