vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1206 from nlacasse/state-ignore-stderr

Browse source 
Only parse stdout from "state" command.  Ignore stderr.
This commit is contained in:
Mrunal Patel 2017-12-07 11:29:25 -08:00 committed by GitHub
commit 1f3fbdc987
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oci/oci.go
View file

@ -669,7 +669,7 @@ func (r *Runtime) SetStartFailed(c *Container, err error) {
func (r *Runtime) UpdateStatus(c *Container) error { func (r *Runtime) UpdateStatus(c *Container) error {
c.opLock.Lock() c.opLock.Lock()
defer c.opLock.Unlock() defer c.opLock.Unlock()
out, err := exec.Command(r.Path(c), "state", c.id).CombinedOutput() out, err := exec.Command(r.Path(c), "state", c.id).Output()
if err != nil { if err != nil {
// there are many code paths that could lead to have a bad state in the // there are many code paths that could lead to have a bad state in the
// underlying runtime. // underlying runtime.