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

Merge pull request #1078 from mlaventure/bubble-correct-runc-error

Browse Source 
shim: Use correct error when trying to expand runc error
This commit is contained in:
Michael Crosby 2017-06-23 11:43:59 -07:00 committed by GitHub
commit a33e8d034f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/shim/init.go
View File

@ -323,9 +323,9 @@ func (p *initProcess) runcError(rErr error, msg string) error {
rMsg, err := getLastRuncError(p.runc) rMsg, err := getLastRuncError(p.runc)
switch { switch {
case err != nil: case err != nil:
return errors.Wrapf(err, "%s: %s (%s)", msg, "unable to retrieve runc error", err.Error()) return errors.Wrapf(rErr, "%s: %s (%s)", msg, "unable to retrieve runc error", err.Error())
case rMsg == "": case rMsg == "":
return errors.Wrap(err, msg) return errors.Wrap(rErr, msg)
default: default:
return errors.Errorf("%s: %s", msg, rMsg) return errors.Errorf("%s: %s", msg, rMsg)
} }