beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40257 from thaJeztah/bump_go_runc

Browse source 
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
This commit is contained in:
Brian Goff 2019-12-19 11:32:38 -08:00 committed by GitHub
commit 0971ab57f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor.conf
View file

@ -122,7 +122,7 @@ github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
github.com/containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
github.com/containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
github.com/containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0

12
vendor/github.com/containerd/go-runc/runc.go generated vendored
View file

@ -172,7 +172,7 @@ func (r *Runc) Create(context context.Context, id, bundle string, opts *CreateOp
}
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return err
}
@ -251,7 +251,7 @@ func (r *Runc) Exec(context context.Context, id string, spec specs.Process, opts
}
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return err
}
@ -277,7 +277,7 @@ func (r *Runc) Run(context context.Context, id, bundle string, opts *CreateOpts)
}
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return status, err
}
@ -576,7 +576,7 @@ func (r *Runc) Restore(context context.Context, id, bundle string, opts *Restore
}
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return status, err
}
@ -682,7 +682,7 @@ func (r *Runc) runOrError(cmd *exec.Cmd) error {
}
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return err
}
@ -708,7 +708,7 @@ func cmdOutput(cmd *exec.Cmd, combined bool) ([]byte, error) {
status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 {
err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0])
err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0])
}
return b.Bytes(), err