opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 01:08:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Exec: use ErrorConmonRead"

Browse Source 
This reverts commit d3d97a25e8c87cf741b2e24ac01ef84962137106.

This does not resolve the issues we expected it would, and has
some unexpected side effects with the upcoming exec rework.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2020-03-09 09:48:47 -04:00
parent 6be87b2186
commit ffce869daa
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_api.go
View File

@ -297,9 +297,7 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri
// Conmon will pass a non-zero exit code from the runtime as a pid here.
// we differentiate a pid with an exit code by sending it as negative, so reverse
// that change and return the exit code the runtime failed with.
// Make sure the value is not ErrorConmonRead, as that is a podman set bogus value
// and not sent by conmon (and thus has no special meaning)
if pid < 0 && pid != define.ErrorConmonRead {
if pid < 0 {
ec = -1 * pid
}
return ec, err