diff options
| author | baude <bbaude@redhat.com> | 2018-11-07 10:44:33 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-11-07 10:44:33 -0600 |
| commit | e022efa0f87b8c0d59ce8efeb370b3eeed145a28 (patch) | |
| tree | 7c34987b1112f6c6de27a589f4ec92671d9f9d94 /libpod/container_internal_linux.go | |
| parent | 48914d67aed53ad793d86c98a6a4e96cfefe7333 (diff) | |
| download | podman-e022efa0f87b8c0d59ce8efeb370b3eeed145a28.tar.gz podman-e022efa0f87b8c0d59ce8efeb370b3eeed145a28.tar.bz2 podman-e022efa0f87b8c0d59ce8efeb370b3eeed145a28.zip | |
move defer'd function declaration ahead of prepare error return
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 7bf2c71ca..df94a0571 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -484,9 +484,6 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) { } } - if err := c.prepare(); err != nil { - return err - } defer func() { if err != nil { if err2 := c.cleanup(ctx); err2 != nil { @@ -495,6 +492,10 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) { } }() + if err := c.prepare(); err != nil { + return err + } + // TODO: use existing way to request static IPs, once it is merged in ocicni // https://github.com/cri-o/ocicni/pull/23/ |