@@ -84,7 +84,7 @@ func (s *HardwareLoader) Run(context map[string]interface{}) error {
84
84
}
85
85
86
86
targetPackage := getOrCreatePackage (packages , packageId )
87
- err = loadPackage (targetPackage , subfolderPath , logger )
87
+ err = loadPackage (targetPackage , subfolderPath , logger , context )
88
88
if err != nil {
89
89
return utils .WrapError (err )
90
90
}
@@ -110,7 +110,7 @@ func getOrCreatePackage(packages *types.Packages, packageId string) *types.Packa
110
110
return & targetPackage
111
111
}
112
112
113
- func loadPackage (targetPackage * types.Package , folder string , logger i18n.Logger ) error {
113
+ func loadPackage (targetPackage * types.Package , folder string , logger i18n.Logger , context map [ string ] interface {} ) error {
114
114
packagePlatformTxt , err := props .SafeLoad (filepath .Join (folder , constants .FILE_PLATFORM_TXT ), logger )
115
115
if err != nil {
116
116
return utils .WrapError (err )
@@ -131,9 +131,14 @@ func loadPackage(targetPackage *types.Package, folder string, logger i18n.Logger
131
131
132
132
_ , err := os .Stat (filepath .Join (subfolderPath , constants .FILE_BOARDS_TXT ))
133
133
if err != nil && os .IsNotExist (err ) {
134
- theOnlySubfolder , err := utils .TheOnlySubfolderOf (subfolderPath )
134
+ theOnlySubfolder , err := utils .TheBestSubfolderOf (subfolderPath )
135
135
if err != nil {
136
- return utils .WrapError (err )
136
+ if theOnlySubfolder != constants .EMPTY_STRING {
137
+ logger := context [constants .CTX_LOGGER ].(i18n.Logger )
138
+ logger .Fprintln (os .Stdout , constants .LOG_LEVEL_WARN , constants .MSG_CORES_MULTIPLE_CORES_FOUND_FOR , platformId , err .Error ())
139
+ } else {
140
+ return utils .WrapError (err )
141
+ }
137
142
}
138
143
139
144
if theOnlySubfolder != constants .EMPTY_STRING {
0 commit comments