Commit d1929de

committed

Removed all wrong accesses to package Explorer

1 parent f2609ca commit d1929deCopy full SHA for d1929de

File tree

2 files changed

-23

lines changed

internal/cli/arguments
- completion.go
- port.go

2 files changed

-23

lines changed

`‎internal/cli/arguments/completion.go‎`

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/arduino/arduino-cli/commands/board"`
`22`	`22`	`"github.com/arduino/arduino-cli/commands/core"`
`23`		`- "github.com/arduino/arduino-cli/commands/internal/instances"`
`24`	`23`	`"github.com/arduino/arduino-cli/commands/lib"`
`25`	`24`	`"github.com/arduino/arduino-cli/commands/upload"`
`26`	`25`	`"github.com/arduino/arduino-cli/internal/cli/instance"`
`@@ -51,13 +50,6 @@ func GetInstalledBoards() []string {`
`51`	`50`	`func GetInstalledProtocols() []string {`
`52`	`51`	`inst := instance.CreateAndInit()`
`53`	`52`
`54`		`- // FIXME: We must not access PackageManager directly here but use one of the commands.* functions`
`55`		`- pme, release := instances.GetPackageManagerExplorer(inst)`
`56`		`- if pme == nil {`
`57`		`- return nil // should never happen...`
`58`		`- }`
`59`		`- defer release()`
`60`		`-`
`61`	`53`	`boards := pme.InstalledBoards()`
`62`	`54`
`63`	`55`	`installedProtocols := make(map[string]struct{})`
`@@ -94,13 +86,6 @@ func GetInstalledProgrammers() []string {`
`94`	`86`	`}`
`95`	`87`	`list, _ := board.ListAll(context.Background(), listAllReq)`
`96`	`88`
`97`		`- // FIXME: We must not access PackageManager directly here but use one of the commands.* functions`
`98`		`- pme, release := instances.GetPackageManagerExplorer(inst)`
`99`		`- if pme == nil {`
`100`		`- return nil // should never happen...`
`101`		`- }`
`102`		`- defer release()`
`103`		`-`
`104`	`89`	`installedProgrammers := make(map[string]string)`
`105`	`90`	`for _, board := range list.Boards {`
`106`	`91`	`programmers, _ := upload.ListProgrammersAvailableForUpload(context.Background(), &rpc.ListProgrammersAvailableForUploadRequest{`

`‎internal/cli/arguments/port.go‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/arduino/arduino-cli/arduino"`
`23`	`23`	`"github.com/arduino/arduino-cli/commands/board"`
`24`		`- "github.com/arduino/arduino-cli/commands/internal/instances"`
`25`	`24`	`"github.com/arduino/arduino-cli/internal/cli/feedback"`
`26`	`25`	`rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"`
`27`	`26`	`"github.com/sirupsen/logrus"`
`@@ -88,13 +87,6 @@ func (p Port) GetPort(instance rpc.Instance, defaultAddress, defaultProtocol s`
`88`	`87`	`}`
`89`	`88`	`logrus.WithField("port", address).Tracef("Upload port")`
`90`	`89`
`91`		`- // FIXME: We must not access PackageManager directly here but use one of the commands.* functions`
`92`		`- pme, release := instances.GetPackageManagerExplorer(instance)`
`93`		`- if pme == nil {`
`94`		`- return nil, &arduino.InvalidInstanceError{}`
`95`		`- }`
`96`		`- defer release()`
`97`		`-`
`98`	`90`	`dm := pme.DiscoveryManager()`
`99`	`91`	`watcher, err := dm.Watch()`
`100`	`92`	`if err != nil {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit d1929de

File tree

2 files changed

2 files changed

`‎internal/cli/arguments/completion.go‎`

`‎internal/cli/arguments/port.go‎`

0 commit comments