Commit 0cc34e0

committed

Correctly mark package manager instance as "under profile"

even in case an unversioned platform is requsted.

1 parent 69761fb commit 0cc34e0Copy full SHA for 0cc34e0

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -243,11 +243,16 @@ func (s arduinoCoreServerImpl) Init(req rpc.InitRequest, stream rpc.ArduinoCor`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`// Load Platforms`
`246`		`- if profile == nil \|\|profile.RequireSystemInstalledPlatform() {`
	`246`	`+ if profile == nil {`
`247`	`247`	`for _, err := range pmb.LoadHardware() {`
`248`	`248`	`s := &cmderrors.PlatformLoadingError{Cause: err}`
`249`	`249`	`responseError(s.GRPCStatus())`
`250`	`250`	`}`
	`251`	`+ } else if profile.RequireSystemInstalledPlatform() {`
	`252`	`+ for _, err := range pmb.LoadGlobalHardwareForProfile(profile) {`
	`253`	`+ s := &cmderrors.PlatformLoadingError{Cause: err}`
	`254`	`+ responseError(s.GRPCStatus())`
	`255`	`+ }`
`251`	`256`	`} else {`
`252`	`257`	`// Load platforms from profile`
`253`	`258`	`errs := pmb.LoadHardwareForProfile(ctx, profile, true, downloadCallback, taskCallback, s.settings)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,13 @@ import (`
`33`	`33`	`"github.com/sirupsen/logrus"`
`34`	`34`	`)`
`35`	`35`
	`36`	`+// LoadGlobalHardwareForProfile loads the hardware platforms for the given profile.`
	`37`	`+// It uses the global package manager and does not download or install any missing tools or platforms.`
	`38`	`+func (pmb Builder) LoadGlobalHardwareForProfile(p sketch.Profile) []error {`
	`39`	`+ pmb.profile = p`
	`40`	`+ return pmb.LoadHardware()`
	`41`	`+}`
	`42`	`+`
`36`	`43`	`// LoadHardwareForProfile load the hardware platforms for the given profile.`
`37`	`44`	`// If installMissing is true then possibly missing tools and platforms will be downloaded and installed.`
`38`	`45`	`func (pmb Builder) LoadHardwareForProfile(ctx context.Context, p sketch.Profile, installMissing bool, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB, settings *configuration.Settings) []error {`

Comments

(0)