summaryrefslogtreecommitdiff
path: root/libpod/runtime_pod_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-13 21:03:21 +0100
committerGitHub <noreply@github.com>2020-01-13 21:03:21 +0100
commit796ae87b1a3444557644944ddeb7cb37e303ef83 (patch)
tree192bd260c0b35519fe45ecbc91d7212251d82495 /libpod/runtime_pod_linux.go
parentc1d93666d4b175be29a0ba229ee0b94d50765888 (diff)
parent768c476ae3c1dbf37204f5769b43746358af899d (diff)
downloadpodman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.gz
podman-796ae87b1a3444557644944ddeb7cb37e303ef83.tar.bz2
podman-796ae87b1a3444557644944ddeb7cb37e303ef83.zip
Merge pull request #4850 from vrothberg/fix-linting
Fix linting
Diffstat (limited to 'libpod/runtime_pod_linux.go')
-rw-r--r--libpod/runtime_pod_linux.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index 563d9728a..450c64d24 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -19,7 +19,7 @@ import (
)
// NewPod makes a new, empty pod
-func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Pod, Err error) {
+func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Pod, deferredErr error) {
r.lock.Lock()
defer r.lock.Unlock()
@@ -65,7 +65,7 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Po
pod.config.LockID = pod.lock.ID()
defer func() {
- if Err != nil {
+ if deferredErr != nil {
if err := pod.lock.Free(); err != nil {
logrus.Errorf("Error freeing pod lock after failed creation: %v", err)
}
@@ -126,7 +126,7 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Po
return nil, errors.Wrapf(err, "error adding pod to state")
}
defer func() {
- if Err != nil {
+ if deferredErr != nil {
if err := r.removePod(ctx, pod, true, true); err != nil {
logrus.Errorf("Error removing pod after pause container creation failure: %v", err)
}