From 1425fd4fcc0a0363a46ba99dd9246e9f22dfe228 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 10 Apr 2019 15:20:56 +0200 Subject: [PATCH] controller.loadIPAMDriver: Unwrap error type returned by PluginGetter moby/moby commit b27f70d45 wraps the ErrNotFound error returned when a plugin cannot be found, to include a backtrace. This changes the type of the error, so contoller.loadIPAMDriver no longer converts it to a libnetwork plugin.NotFoundError. This is a similar patch as was merged in 9b114971e53b2ee3a917dc20346e869bf4e432e7 Signed-off-by: Sebastiaan van Stijn --- libnetwork/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 3b92b695c7..a182cdc8e9 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -1298,7 +1298,7 @@ func (c *controller) loadIPAMDriver(name string) error { } if err != nil { - if err == plugins.ErrNotFound { + if errors.Cause(err) == plugins.ErrNotFound { return types.NotFoundErrorf(err.Error()) } return err