Merge pull request containerd#354 from crosbymichael/derr

crosbymichael · web-flow · commit 03e5862ec0d8 · 2016-11-17T14:24:35.000-08:00
Fix the error check in Delete method
diff --git a/runtime/container.go b/runtime/container.go
@@ -251,7 +251,7 @@ func (c *container) readSpec() (*specs.Spec, error) {
 func (c *container) Delete() error {
 	var err error
 	args := append(c.runtimeArgs, "delete", c.id)
-	if b, derr := exec.Command(c.runtime, args...).CombinedOutput(); err != nil {
+	if b, derr := exec.Command(c.runtime, args...).CombinedOutput(); derr != nil {
 		err = fmt.Errorf("%s: %q", derr, string(b))
 	}
 	if rerr := os.RemoveAll(filepath.Join(c.root, c.id)); rerr != nil {

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ func (c container) readSpec() (specs.Spec, error) {`
`251`	`251`	`func (c *container) Delete() error {`
`252`	`252`	`var err error`
`253`	`253`	`args := append(c.runtimeArgs, "delete", c.id)`
`254`		`- if b, derr := exec.Command(c.runtime, args...).CombinedOutput(); err != nil {`
	`254`	`+ if b, derr := exec.Command(c.runtime, args...).CombinedOutput(); derr != nil {`
`255`	`255`	`err = fmt.Errorf("%s: %q", derr, string(b))`
`256`	`256`	`}`
`257`	`257`	`if rerr := os.RemoveAll(filepath.Join(c.root, c.id)); rerr != nil {`