Merge pull request moby#2094 from luzhipeng-zte/removelinkdel

Flavio Crisciani · web-flow · commit 5bbc19d7fea0 · 2018-02-27T17:44:08.000-08:00
fix for moby#1333, calling LinkDel to delete link device when the err is NULL
diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go
@@ -242,7 +242,7 @@ func (d *driver) DeleteNetwork(nid string) error {
 
 	for _, ep := range n.endpoints {
 		if ep.ifName != "" {
-			if link, err := ns.NlHandle().LinkByName(ep.ifName); err != nil {
+			if link, err := ns.NlHandle().LinkByName(ep.ifName); err == nil {
 				ns.NlHandle().LinkDel(link)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (d *driver) DeleteNetwork(nid string) error {`
`242`	`242`
`243`	`243`	`for _, ep := range n.endpoints {`
`244`	`244`	`if ep.ifName != "" {`
`245`		`- if link, err := ns.NlHandle().LinkByName(ep.ifName); err != nil {`
	`245`	`+ if link, err := ns.NlHandle().LinkByName(ep.ifName); err == nil {`
`246`	`246`	`ns.NlHandle().LinkDel(link)`
`247`	`247`	`}`
`248`	`248`	`}`