opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-11 00:54:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "exec: fix error code when conmon fails"

Browse Source 
This reverts commit 4632b81c81a73025a960e339f40bc805f8a6c70a.

We are reverting #5373 as well, which lays the foundation for
this commit, so it has to go as well.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2020-03-09 09:25:12 -04:00
parent 6b3f447c8e
commit 6be87b2186
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_api.go
View File

@ -340,12 +340,6 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri
if lastErr != nil {
logrus.Errorf(lastErr.Error())
}
// ErrorConmonRead is a bogus value set by podman to indicate reading a value from
// conmon failed. Since it is specifically not a valid exit code, we should set
// a generic error here
if exitCodeData.data == define.ErrorConmonRead {
exitCodeData.data = define.ExecErrorCodeGeneric
}
lastErr = errors.Wrapf(define.ErrOCIRuntime, "non zero exit code: %d", exitCodeData.data)
}