diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-13 22:55:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 22:55:52 +0100 |
| commit | dfc64e15d7f8b1715798fd68bd3ff74ae192b354 (patch) | |
| tree | 28fff3097e5705623bc48670c67dee64a5296329 /libpod/container_attach_linux.go | |
| parent | 29d9ccf38158235ef37e4f5c20ad152bb396e3b9 (diff) | |
| parent | 9d4e7fe58b10c4130340a151a377cf7be8aaa810 (diff) | |
| download | podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.tar.gz podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.tar.bz2 podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.zip | |
Merge pull request #2319 from mheon/unconditional_cleanup
Fix manual detach from containers to not wait for exit
Diffstat (limited to 'libpod/container_attach_linux.go')
| -rw-r--r-- | libpod/container_attach_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_attach_linux.go b/libpod/container_attach_linux.go index 1d6f0bd96..3ff6ddc76 100644 --- a/libpod/container_attach_linux.go +++ b/libpod/container_attach_linux.go @@ -109,8 +109,8 @@ func (c *Container) attachContainerSocket(resize <-chan remotecommand.TerminalSi case err := <-receiveStdoutError: return err case err := <-stdinDone: - if _, ok := err.(utils.DetachError); ok { - return nil + if err == ErrDetach { + return err } if streams.AttachOutput || streams.AttachError { return <-receiveStdoutError |