diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-07 10:55:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 10:55:51 -0800 |
| commit | 1370c311f57673d6e3bfc529bc9819d472cfcecb (patch) | |
| tree | cb9e53bea2c651c9c88c522b3c622def94037bbc /libpod/container_api.go | |
| parent | ae031378619ba78bcd22a3c2ee9b276506c1dbd3 (diff) | |
| parent | e022efa0f87b8c0d59ce8efeb370b3eeed145a28 (diff) | |
| download | podman-1370c311f57673d6e3bfc529bc9819d472cfcecb.tar.gz podman-1370c311f57673d6e3bfc529bc9819d472cfcecb.tar.bz2 podman-1370c311f57673d6e3bfc529bc9819d472cfcecb.zip | |
Merge pull request #1771 from baude/prepare
move defer'd function declaration ahead of prepare error return
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 25c1fb5f9..d99aec5b4 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -46,9 +46,6 @@ func (c *Container) Init(ctx context.Context) (err error) { return errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString) } - if err := c.prepare(); err != nil { - return err - } defer func() { if err != nil { if err2 := c.cleanup(ctx); err2 != nil { @@ -57,6 +54,10 @@ func (c *Container) Init(ctx context.Context) (err error) { } }() + if err := c.prepare(); err != nil { + return err + } + if c.state.State == ContainerStateStopped { // Reinitialize the container return c.reinit(ctx) @@ -99,9 +100,6 @@ func (c *Container) Start(ctx context.Context) (err error) { return errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString) } - if err := c.prepare(); err != nil { - return err - } defer func() { if err != nil { if err2 := c.cleanup(ctx); err2 != nil { @@ -110,6 +108,10 @@ func (c *Container) Start(ctx context.Context) (err error) { } }() + if err := c.prepare(); err != nil { + return err + } + if c.state.State == ContainerStateStopped { // Reinitialize the container if we need to if err := c.reinit(ctx); err != nil { @@ -164,9 +166,6 @@ func (c *Container) StartAndAttach(ctx context.Context, streams *AttachStreams, return nil, errors.Wrapf(ErrCtrStateInvalid, "some dependencies of container %s are not started: %s", c.ID(), depString) } - if err := c.prepare(); err != nil { - return nil, err - } defer func() { if err != nil { if err2 := c.cleanup(ctx); err2 != nil { @@ -175,6 +174,10 @@ func (c *Container) StartAndAttach(ctx context.Context, streams *AttachStreams, } }() + if err := c.prepare(); err != nil { + return nil, err + } + if c.state.State == ContainerStateStopped { // Reinitialize the container if we need to if err := c.reinit(ctx); err != nil { |