Skip to content

Commit 10d95b2

Browse files
committed
Made packagemamager.loadToolsFromPackage public
1 parent 8527015 commit 10d95b2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arduino/cores/packagemanager/loader.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) []error {
128128
toolsSubdirPath := packagerPath.Join("tools")
129129
if toolsSubdirPath.IsDir() {
130130
pm.Log.Infof("Checking existence of 'tools' path: %s", toolsSubdirPath)
131-
merr = append(merr, pm.loadToolsFromPackage(targetPackage, toolsSubdirPath)...)
131+
merr = append(merr, pm.LoadToolsFromPackageDir(targetPackage, toolsSubdirPath)...)
132132
}
133133
// If the Package does not contain Platforms or Tools we remove it since does not contain anything valuable
134134
if len(targetPackage.Platforms) == 0 && len(targetPackage.Tools) == 0 {
@@ -589,7 +589,7 @@ func convertUploadToolsToPluggableDiscovery(props *properties.Map) {
589589
props.Merge(propsToAdd)
590590
}
591591

592-
func (pm *PackageManager) loadToolsFromPackage(targetPackage *cores.Package, toolsPath *paths.Path) []error {
592+
func (pm *PackageManager) LoadToolsFromPackageDir(targetPackage *cores.Package, toolsPath *paths.Path) []error {
593593
pm.Log.Infof("Loading tools from dir: %s", toolsPath)
594594

595595
var merr []error
@@ -712,7 +712,7 @@ func (pm *PackageManager) LoadToolsFromBundleDirectory(toolsPath *paths.Path) er
712712
} else {
713713
// otherwise load the tools inside the unnamed package
714714
unnamedPackage := pm.Packages.GetOrCreatePackage("")
715-
pm.loadToolsFromPackage(unnamedPackage, toolsPath)
715+
pm.LoadToolsFromPackageDir(unnamedPackage, toolsPath)
716716
}
717717
return nil
718718
}

0 commit comments

Comments
 (0)