Skip to content

Commit ad9cee9

Browse files
committed
Merge branch 'master' of https://github.com/arduino/arduino-cli into HEAD
2 parents 6bb9425 + 5358b8e commit ad9cee9

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

commands/board/attach.go

+5
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,12 @@ func BoardAttach(ctx context.Context, req *rpc.BoardAttachReq) (*rpc.BoardAttach
104104

105105
err = sketch.ExportMetadata()
106106
if err != nil {
107+
<<<<<<< HEAD
107108
return nil, fmt.Errorf("cannot export sketch metadata: %s", err)
109+
=======
110+
formatter.PrintError(err, "Cannot export sketch metadata.")
111+
os.Exit(commands.ErrGeneric)
112+
>>>>>>> 5358b8ed08945f8db0242c77427e79e44f03c7d9
108113
}
109114
formatter.PrintResult("Selected fqbn: " + sketch.Metadata.CPU.Fqbn)
110115
return &rpc.BoardAttachResp{}, nil

0 commit comments

Comments
 (0)