mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-25 17:27:25 +00:00
Code Issues Releases Wiki Activity

detect and return error from file Close() in Node.createFileAt()

Browse source 
gh-1385
This commit is contained in:
George Armhold 2017-10-26 13:53:31 -04:00
parent bcdebfb84e
commit f5fa602482
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internal/restic/node.go
View file

@ -253,8 +253,26 @@ func (node Node) createFileAt(ctx context.Context, path string, repo Repository,
if err != nil { if err != nil {
return errors.Wrap(err, "OpenFile") return errors.Wrap(err, "OpenFile")
} }
defer f.Close()
err = node.writeNodeContent(ctx, repo, f)
closeErr := f.Close()
if err != nil {
return err
}
if closeErr != nil {
return errors.Wrap(closeErr, "Close")
}
if node.Links > 1 {
idx.Add(node.Inode, node.DeviceID, path)
}
return nil
}
func (node Node) writeNodeContent(ctx context.Context, repo Repository, f *os.File) (error) {
var buf []byte var buf []byte
for _, id := range node.Content { for _, id := range node.Content {
size, err := repo.LookupBlobSize(id, DataBlob) size, err := repo.LookupBlobSize(id, DataBlob)
@ -279,10 +297,6 @@ func (node Node) createFileAt(ctx context.Context, path string, repo Repository,
} }
} }
if node.Links > 1 {
idx.Add(node.Inode, node.DeviceID, path)
}
return nil return nil
} }