diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-15 21:41:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 21:41:00 +0200 |
| commit | a28f8dbecd2a28c6e4e2ea2aa95b75dda4b0adb4 (patch) | |
| tree | e28e643f693e546bb4113536db5616064c058c90 | |
| parent | 547cb4e55e9262b7127706d07291f0e45ccf4f42 (diff) | |
| parent | d52a2d1e54cc147eea12c2e91808c015804abb8b (diff) | |
| download | podman-a28f8dbecd2a28c6e4e2ea2aa95b75dda4b0adb4.tar.gz podman-a28f8dbecd2a28c6e4e2ea2aa95b75dda4b0adb4.tar.bz2 podman-a28f8dbecd2a28c6e4e2ea2aa95b75dda4b0adb4.zip | |
Merge pull request #3531 from haraldh/fix_ReplySendFile
Fix the double replySendFile()
| -rw-r--r-- | pkg/varlinkapi/transfers.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go index 24a91a86f..31d26c3aa 100644 --- a/pkg/varlinkapi/transfers.go +++ b/pkg/varlinkapi/transfers.go @@ -26,11 +26,6 @@ func (i *LibpodAPI) SendFile(call iopodman.VarlinkCall, ftype string, length int defer outputFile.Close() 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 return err } |