diff options
| author | baude <bbaude@redhat.com> | 2019-07-10 13:14:17 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-07-11 09:13:06 -0500 |
| commit | a78c885397ad2938b9b21438bcfa8a00dd1eb03f (patch) | |
| tree | d02607bb19379942b5cac3aa50e1c7428d68e8b9 /libpod/image/pull.go | |
| parent | e2e8477f83f717d6a92badd317ae909cf185d04e (diff) | |
| download | podman-a78c885397ad2938b9b21438bcfa8a00dd1eb03f.tar.gz podman-a78c885397ad2938b9b21438bcfa8a00dd1eb03f.tar.bz2 podman-a78c885397ad2938b9b21438bcfa8a00dd1eb03f.zip | |
golangci-lint pass number 2
clean up and prepare to migrate to the golangci-linter
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/image/pull.go')
| -rw-r--r-- | libpod/image/pull.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index ce8a19fbc..581beb538 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -249,7 +249,11 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa if err != nil { return nil, err } - defer policyContext.Destroy() + defer func() { + if err := policyContext.Destroy(); err != nil { + logrus.Errorf("failed to destroy policy context: %q", err) + } + }() systemRegistriesConfPath := registries.SystemRegistriesConfPath() @@ -304,7 +308,7 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa return nil, pullErrors } if len(images) > 0 { - defer ir.newImageEvent(events.Pull, images[0]) + ir.newImageEvent(events.Pull, images[0]) } return images, nil } |