Skip to content

Commit 00840b0

Browse files
authored
do not exit with an error if lib is not present (#299)
1 parent f8fb5de commit 00840b0

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

Diff for: commands/lib/uninstall.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,20 @@ import (
2828
// LibraryUninstall FIXMEDOC
2929
func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallReq, taskCB commands.TaskProgressCB) error {
3030
lm := commands.GetLibraryManager(req)
31-
32-
lib, err := findLibrary(lm, req)
31+
ref, err := createLibIndexReference(lm, req)
3332
if err != nil {
34-
return fmt.Errorf("looking for library: %s", err)
33+
return err
3534
}
3635

37-
taskCB(&rpc.TaskProgress{Name: "Uninstalling " + lib.String()})
38-
lm.Uninstall(lib)
39-
taskCB(&rpc.TaskProgress{Completed: true})
36+
lib := lm.FindByReference(ref)
37+
38+
if lib == nil {
39+
taskCB(&rpc.TaskProgress{Message: fmt.Sprintf("Library %s is not installed", req.Name), Completed: true})
40+
} else {
41+
taskCB(&rpc.TaskProgress{Name: "Uninstalling " + lib.String()})
42+
lm.Uninstall(lib)
43+
taskCB(&rpc.TaskProgress{Completed: true})
44+
}
4045

4146
return nil
4247
}

Diff for: commands/lib/utils.go

-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package lib
2020
import (
2121
"fmt"
2222

23-
"github.com/arduino/arduino-cli/arduino/libraries"
2423
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
2524
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
2625
"github.com/arduino/arduino-cli/commands"
@@ -51,15 +50,3 @@ func findLibraryIndexRelease(lm *librariesmanager.LibrariesManager, req libraryR
5150
}
5251
return lib, nil
5352
}
54-
55-
func findLibrary(lm *librariesmanager.LibrariesManager, req libraryReferencer) (*libraries.Library, error) {
56-
ref, err := createLibIndexReference(lm, req)
57-
if err != nil {
58-
return nil, err
59-
}
60-
lib := lm.FindByReference(ref)
61-
if lib == nil {
62-
return nil, fmt.Errorf("library %s is not installed", ref)
63-
}
64-
return lib, nil
65-
}

0 commit comments

Comments
 (0)