[skip changelog] Fix after botched rebase

Author: silvanocerza

commands/instances.go

@@ -17,7 +17,6 @@ package commands
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/url"
@@ -37,6 +36,7 @@ import (
 	"github.com/arduino/arduino-cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	paths "github.com/arduino/go-paths-helper"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"go.bug.st/downloader/v2"
 	"google.golang.org/grpc/codes"
@@ -408,21 +408,11 @@ func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequ
 	}
 
 	// Reinitializes an existing instance
-	initChan, status := Init(&rpc.InitRequest{Instance: &rpc.Instance{Id: req.Instance.Id}})
+	status := Init(&rpc.InitRequest{Instance: &rpc.Instance{Id: req.Instance.Id}}, nil)
 	if status != nil {
 		return status.Err()
 	}
 
-	// Handle responses
-	for response := range initChan {
-		if err := response.GetError(); err != nil {
-			// We return right away without iterating all the errors, the chance
-			// of failure in this case is slim but it would be great in the future
-			// to handle errors when updating the libraries indexes much like we
-			// do when initializing an instance.
-			return fmt.Errorf("rescanning filesystem: %s", err)
-		}
-	}
 	return nil
 }
 
@@ -545,20 +535,10 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB Do
 	}
 
 	// Reinitializes an existing instance
-	initChan, status := Init(&rpc.InitRequest{Instance: &rpc.Instance{Id: req.Instance.Id}})
+	status := Init(&rpc.InitRequest{Instance: &rpc.Instance{Id: req.Instance.Id}}, nil)
 	if status != nil {
 		return nil, status.Err()
 	}
-	// Handle responses
-	for response := range initChan {
-		if err := response.GetError(); err != nil {
-			// We return right away without iterating all the errors, the chance
-			// of failure in this case is slim but it would be great in the future
-			// to handle errors when updating the platforms indexes much like we
-			// do when initializing an instance.
-			return nil, fmt.Errorf("rescanning filesystem: %s", err)
-		}
-	}
 
 	return &rpc.UpdateIndexResponse{}, nil
 }