Merge pull request #31 from Random-Liu/ignore-not-exit-error

abhi · web-flow · commit cc959f741c3d · 2018-10-10T11:17:56.000-07:00
Ignore "no such file or directory" error.
diff --git a/cni.go b/cni.go
@@ -18,6 +18,7 @@ package cni
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
 	cnilibrary "github.com/containernetworking/cni/libcni"
@@ -126,7 +127,7 @@ func (c *libcni) Remove(id string, path string, opts ...NamespaceOpts) error {
 		return err
 	}
 	for _, network := range c.networks {
-		if err := network.Remove(ns); err != nil {
+		if err := network.Remove(ns); err != nil && !strings.Contains(err.Error(), "no such file or directory") {
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package cni`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
	`21`	`+ "strings"`
`21`	`22`	`"sync"`
`22`	`23`
`23`	`24`	`cnilibrary "github.com/containernetworking/cni/libcni"`
`@@ -126,7 +127,7 @@ func (c *libcni) Remove(id string, path string, opts ...NamespaceOpts) error {`
`126`	`127`	`return err`
`127`	`128`	`}`
`128`	`129`	`for _, network := range c.networks {`
`129`		`- if err := network.Remove(ns); err != nil {`
	`130`	`+ if err := network.Remove(ns); err != nil && !strings.Contains(err.Error(), "no such file or directory") {`
`130`	`131`	`return err`
`131`	`132`	`}`
`132`	`133`	`}`