containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3531 from haraldh/fix_ReplySendFile 

Fix the double replySendFile()
This commit is contained in:
OpenShift Merge Robot 2019-07-15 21:41:00 +02:00 committed by GitHub
parent 547cb4e55e d52a2d1e54
commit a28f8dbecd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/varlinkapi/transfers.go
View File

@ -26,11 +26,6 @@ func (i *LibpodAPI) SendFile(call iopodman.VarlinkCall, ftype string, length int
defer outputFile.Close() defer outputFile.Close()
if err = call.ReplySendFile(outputFile.Name()); err != nil { if err = call.ReplySendFile(outputFile.Name()); err != nil {
return call.ReplyErrorOccurred(err.Error())
}
// FIXME return parameter
if err = call.ReplySendFile("FIXME_file_handle"); err != nil {
// If an error occurs while sending the reply, return the error // If an error occurs while sending the reply, return the error
return err return err
} }