Skip to content

Commit 3da06d7

Browse files
committed
fix regressions: use correct exit code when error occurs
1 parent 2d5f68a commit 3da06d7

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

cli/cli_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,8 @@ board_manager:
556556
require.NoError(t, err, "Writing empty json index file")
557557
err = currDataDir.Join("package_example_index.json").WriteFile([]byte(`{ "packages": [] }`))
558558
require.NoError(t, err, "Writing empty json index file")
559+
err = currDataDir.Join("library_index.json").WriteFile([]byte(`{ "libraries": [] }`))
560+
require.NoError(t, err, "Writing empty json index file")
559561

560562
// Empty cores list
561563
exitCode, d := executeWithArgs(t, "--config-file", configFile.String(), "core", "list")

cli/core/download.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package core
1919

2020
import (
2121
"context"
22+
"os"
2223

2324
"github.com/arduino/arduino-cli/cli"
2425
"github.com/arduino/arduino-cli/commands/core"
@@ -56,6 +57,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
5657
}, cli.OutputProgressBar())
5758
if err != nil {
5859
formatter.PrintError(err, "Error downloading "+platformRef.String())
60+
os.Exit(cli.ErrNetwork)
5961
}
6062
}
6163
}

cli/core/uninstall.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ package core
1919

2020
import (
2121
"context"
22+
"os"
2223

2324
"github.com/arduino/arduino-cli/cli"
2425
"github.com/arduino/arduino-cli/commands/core"
26+
"github.com/arduino/arduino-cli/common/formatter"
2527
"github.com/arduino/arduino-cli/output"
2628
"github.com/arduino/arduino-cli/rpc"
2729
"github.com/sirupsen/logrus"
@@ -46,11 +48,15 @@ func runUninstallCommand(cmd *cobra.Command, args []string) {
4648
platformsRefs := parsePlatformReferenceArgs(args)
4749

4850
for _, platformRef := range platformsRefs {
49-
core.PlatformUninstall(context.Background(), &rpc.PlatformUninstallReq{
51+
_, err := core.PlatformUninstall(context.Background(), &rpc.PlatformUninstallReq{
5052
Instance: instance,
5153
PlatformPackage: platformRef.Package,
5254
Architecture: platformRef.PlatformArchitecture,
5355
Version: platformRef.PlatformVersion.String(),
5456
}, output.NewTaskProgressCB())
57+
if err != nil {
58+
formatter.PrintError(err, "Error during uninstall")
59+
os.Exit(cli.ErrGeneric)
60+
}
5561
}
5662
}

0 commit comments

Comments
 (0)