Merge pull request #2727 from nirs/downloader-cleanup-on-error

Always delete downloader temporary data file
lima-vm · Oct 11, 2024 · 4561580 · 4561580
2 parents a07b7f9 + 03dbe70
commit 4561580
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go
@@ -599,13 +599,6 @@ func downloadHTTP(ctx context.Context, localPath, lastModified, contentType, url
  }
  logrus.Debugf("downloading %q into %q", url, localPath)
 
- localPathTmp := perProcessTempfile(localPath)
- fileWriter, err := os.Create(localPathTmp)
- if err != nil {
- return err
- }
- defer fileWriter.Close()
-
  resp, err := httpclientutil.Get(ctx, http.DefaultClient, url)
  if err != nil {
  return err
@@ -631,6 +624,14 @@ func downloadHTTP(ctx context.Context, localPath, lastModified, contentType, url
  hideBar(bar)
  }
 
+ localPathTmp := perProcessTempfile(localPath)
+ fileWriter, err := os.Create(localPathTmp)
+ if err != nil {
+ return err
+ }
+ defer fileWriter.Close()
+ defer os.RemoveAll(localPathTmp)
+
  writers := []io.Writer{fileWriter}
  var digester digest.Digester
  if expectedDigest != "" {