From df32f2591af4f40f8297cf977a7f1fc90e85ca27 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 21 Dec 2015 16:13:02 -0800 Subject: [PATCH] Revert create return parameter removal Cleanup does not happen if retErr is not set on return Signed-off-by: Derek McGowan (github: dmcgowan) Upstream-commit: 54f8ba7e9e496ae58c15eddb084fbd51418ab197 Component: engine --- components/engine/daemon/create.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/engine/daemon/create.go b/components/engine/daemon/create.go index 2e173db81f..bebf1ac29e 100644 --- a/components/engine/daemon/create.go +++ b/components/engine/daemon/create.go @@ -42,13 +42,12 @@ func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig) (types } // Create creates a new container from the given configuration with a given name. -func (daemon *Daemon) create(params types.ContainerCreateConfig) (*container.Container, error) { +func (daemon *Daemon) create(params types.ContainerCreateConfig) (retC *container.Container, retErr error) { var ( container *container.Container img *image.Image imgID image.ID err error - retErr error ) if params.Config.Image != "" {