github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3851 from thaJeztah/bump_go_runc

Browse Source 
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
This commit is contained in:
Akihiro Suda 2019-11-26 23:50:40 +09:00 committed by GitHub
commit 75a46cec6a
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

@ -1,4 +1,4 @@
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f github.com/containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
github.com/containerd/cgroups abd0b19954a6b05e0963f48427062d1481b7faad github.com/containerd/cgroups abd0b19954a6b05e0963f48427062d1481b7faad
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40 github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40

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) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 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) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 return err
} }
@ -277,7 +277,7 @@ func (r *Runc) Run(context context.Context, id, bundle string, opts *CreateOpts)
} }
status, err := Monitor.Wait(cmd, ec) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 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) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 return status, err
} }
@ -682,7 +682,7 @@ func (r *Runc) runOrError(cmd *exec.Cmd) error {
} }
status, err := Monitor.Wait(cmd, ec) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 return err
} }
@ -708,7 +708,7 @@ func cmdOutput(cmd *exec.Cmd, combined bool) ([]byte, error) {
status, err := Monitor.Wait(cmd, ec) status, err := Monitor.Wait(cmd, ec)
if err == nil && status != 0 { 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 return b.Bytes(), err