diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 13:07:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 13:07:20 -0400 |
| commit | d2764e93df580755fe1b3a1befb79eeff75c4bc4 (patch) | |
| tree | 55d76cb8b46031646d13ec4c64750e7d1b34f395 /libpod/oci_attach_linux.go | |
| parent | 342d99fbc2a990dcd4c122b45a8bb1a14059a338 (diff) | |
| parent | 521ff14d83e387f39058c65361a68d83edae61ba (diff) | |
| download | podman-d2764e93df580755fe1b3a1befb79eeff75c4bc4.tar.gz podman-d2764e93df580755fe1b3a1befb79eeff75c4bc4.tar.bz2 podman-d2764e93df580755fe1b3a1befb79eeff75c4bc4.zip | |
Merge pull request #5429 from mheon/revert_exec_changes
Revert exec changes
Diffstat (limited to 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 5a8198d05..46c70e7eb 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -119,8 +119,8 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c socketPath := buildSocketPath(sockPath) // 2: read from attachFd that the parent process has set up the console socket - if pipeData := readConmonPipeData(attachFd, ""); pipeData.err != nil { - return pipeData.err + if _, err := readConmonPipeData(attachFd, ""); err != nil { + return err } // 2: then attach |