Merge pull request #3744 from MichaelEischer/fix-windows-temp-file

Fix error on temp file deletion on windows
This commit is contained in:
Alexander Neumann 2022-05-10 19:53:25 +02:00 committed by GitHub
commit c270ab1e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions

View File

@ -5,6 +5,7 @@ import (
"hash"
"io"
"os"
"runtime"
"sync"
"github.com/restic/restic/internal/errors"
@ -137,9 +138,12 @@ func (r *Repository) savePacker(ctx context.Context, t restic.BlobType, p *Packe
return errors.Wrap(err, "close tempfile")
}
err = fs.RemoveIfExists(p.tmpfile.Name())
if err != nil {
return errors.Wrap(err, "Remove")
// on windows the tempfile is automatically deleted on close
if runtime.GOOS != "windows" {
err = fs.RemoveIfExists(p.tmpfile.Name())
if err != nil {
return errors.Wrap(err, "Remove")
}
}
// update blobs in the index