From 3c0db0beced160916c8d2dcfd7c734ee783d1dc1 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 11 May 2017 11:45:31 +0200 Subject: [PATCH] oci: ignore non existing containers on delete Signed-off-by: Antonio Murdaca --- oci/oci.go | 5 ++++- utils/utils.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/oci/oci.go b/oci/oci.go index 33e7d18f..96cbc909 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -474,7 +474,10 @@ func (r *Runtime) StopContainer(c *Container) error { func (r *Runtime) DeleteContainer(c *Container) error { c.opLock.Lock() defer c.opLock.Unlock() - return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "delete", c.name) + if _, err := utils.ExecCmd(r.Path(c), "delete", c.name); err != nil && !strings.Contains(err.Error(), "does not exist") { + return err + } + return nil } // UpdateStatus refreshes the status of the container. diff --git a/utils/utils.go b/utils/utils.go index 340e1ba9..a46a7c24 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -23,7 +23,7 @@ func ExecCmd(name string, args ...string) (string, error) { err := cmd.Run() if err != nil { - return "", fmt.Errorf("`%v %v` failed: %v (%v)", name, strings.Join(args, " "), stderr.String(), err) + return "", fmt.Errorf("`%v %v` failed: %v (%v)", name, strings.Join(args, " "), stderr.String(), stdout.String(), err) } return stdout.String(), nil