Skip to content

Commit 3e34dbd

Browse files
committed
Error generation from UpdateIndex
1 parent 344cb7c commit 3e34dbd

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

arduino/cores/packageindex/index.go

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -228,42 +228,35 @@ func UpdateIndex(URL *url.URL, clipath *paths.Path) error {
228228

229229
tmpFile, err := ioutil.TempFile("", "")
230230
if err != nil {
231-
formatter.PrintError(err, "Error creating temp file for download")
232-
return err
231+
return fmt.Errorf("Error creating temp file for download", err)
233232

234233
}
235234
if err := tmpFile.Close(); err != nil {
236-
formatter.PrintError(err, "Error creating temp file for download")
237-
return err
235+
return fmt.Errorf("Error creating temp file for download", err)
238236
}
239237
tmp := paths.New(tmpFile.Name())
240238
defer tmp.Remove()
241239

242240
d, err := downloader.Download(tmp.String(), URL.String())
243241
if err != nil {
244-
formatter.PrintError(err, "Error downloading index "+URL.String())
245-
return err
242+
return fmt.Errorf("Error downloading index "+URL.String(), err)
246243
}
247244
coreIndexPath := clipath.Join(path.Base(URL.Path))
248245
formatter.DownloadProgressBar(d, "Updating index: "+coreIndexPath.Base())
249246
if d.Error() != nil {
250-
formatter.PrintError(d.Error(), "Error downloading index "+URL.String())
251-
return d.Error()
247+
return fmt.Errorf("Error downloading index "+URL.String(), d.Error())
252248
}
253249

254250
if _, err := LoadIndex(tmp); err != nil {
255-
formatter.PrintError(err, "Invalid package index in "+URL.String())
256-
return err
251+
return fmt.Errorf("Invalid package index in "+URL.String(), err)
257252
}
258253

259254
if err := clipath.MkdirAll(); err != nil {
260-
formatter.PrintError(err, "Can't create data directory "+clipath.String())
261-
return err
255+
return fmt.Errorf("Can't create data directory "+clipath.String(), err)
262256
}
263257

264258
if err := tmp.CopyTo(coreIndexPath); err != nil {
265-
formatter.PrintError(err, "Error saving downloaded index "+URL.String())
266-
return err
259+
return fmt.Errorf("Error saving downloaded index "+URL.String(), err)
267260
}
268261
return nil
269262
}

0 commit comments

Comments
 (0)