KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Remove closing logic from Packer.Finalize

Browse source 
The method only ever receives *hashing.Writers, which don't implement
io.Closer. These come from packerManager.findPacker and have their
actual writers closed in Repository.savePacker. Moving the closing logic
to hashing.Writer results in "file already closed" errors.
This commit is contained in:
greatroar 2020-03-09 14:11:25 +01:00
parent c542a509f0
commit a23e9c86ba
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/pack/pack.go
View file

@ -61,8 +61,7 @@ type headerEntry struct {
} }
// Finalize writes the header for all added blobs and finalizes the pack. // Finalize writes the header for all added blobs and finalizes the pack.
// Returned are the number of bytes written, including the header. If the // Returned are the number of bytes written, including the header.
// underlying writer implements io.Closer, it is closed.
func (p *Packer) Finalize() (uint, error) { func (p *Packer) Finalize() (uint, error) {
p.m.Lock() p.m.Lock()
defer p.m.Unlock() defer p.m.Unlock()
@ -101,11 +100,6 @@ func (p *Packer) Finalize() (uint, error) {
bytesWritten += uint(binary.Size(uint32(0))) bytesWritten += uint(binary.Size(uint32(0)))
p.bytes = uint(bytesWritten) p.bytes = uint(bytesWritten)
if w, ok := p.wr.(io.Closer); ok {
return bytesWritten, w.Close()
}
return bytesWritten, nil return bytesWritten, nil
} }