@@ -128,7 +128,7 @@ func (pm *PackageManager) LoadHardwareFromDirectory(path *paths.Path) []error {
128
128
toolsSubdirPath := packagerPath .Join ("tools" )
129
129
if toolsSubdirPath .IsDir () {
130
130
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 )... )
132
132
}
133
133
// If the Package does not contain Platforms or Tools we remove it since does not contain anything valuable
134
134
if len (targetPackage .Platforms ) == 0 && len (targetPackage .Tools ) == 0 {
@@ -589,7 +589,7 @@ func convertUploadToolsToPluggableDiscovery(props *properties.Map) {
589
589
props .Merge (propsToAdd )
590
590
}
591
591
592
- func (pm * PackageManager ) loadToolsFromPackage (targetPackage * cores.Package , toolsPath * paths.Path ) []error {
592
+ func (pm * PackageManager ) LoadToolsFromPackageDir (targetPackage * cores.Package , toolsPath * paths.Path ) []error {
593
593
pm .Log .Infof ("Loading tools from dir: %s" , toolsPath )
594
594
595
595
var merr []error
@@ -712,7 +712,7 @@ func (pm *PackageManager) LoadToolsFromBundleDirectory(toolsPath *paths.Path) er
712
712
} else {
713
713
// otherwise load the tools inside the unnamed package
714
714
unnamedPackage := pm .Packages .GetOrCreatePackage ("" )
715
- pm .loadToolsFromPackage (unnamedPackage , toolsPath )
715
+ pm .LoadToolsFromPackageDir (unnamedPackage , toolsPath )
716
716
}
717
717
return nil
718
718
}
0 commit comments