diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-11 21:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 21:35:45 +0200 |
| commit | d614372c2f39cea32641ec92c84a9e48657cfb41 (patch) | |
| tree | 032338943b478c70e6ded7c103cea0311481cca8 /cmd/podman/pod_ps.go | |
| parent | 2b64f8844655b7188332a404ec85d32c33feb9e9 (diff) | |
| parent | a78c885397ad2938b9b21438bcfa8a00dd1eb03f (diff) | |
| download | podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.gz podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.bz2 podman-d614372c2f39cea32641ec92c84a9e48657cfb41.zip | |
Merge pull request #3552 from baude/golangcilint2
golangci-lint pass number 2
Diffstat (limited to 'cmd/podman/pod_ps.go')
| -rw-r--r-- | cmd/podman/pod_ps.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmd/podman/pod_ps.go b/cmd/podman/pod_ps.go index a525857de..fd8da53fb 100644 --- a/cmd/podman/pod_ps.go +++ b/cmd/podman/pod_ps.go @@ -552,9 +552,6 @@ func generatePodPsOutput(pods []*adapter.Pod, opts podPsOptions) error { switch opts.Format { case formats.JSONString: - if err != nil { - return errors.Wrapf(err, "unable to create JSON for output") - } out = formats.JSONStructArray{Output: podPsToGeneric([]podPsTemplateParams{}, psOutput)} default: psOutput, err := getPodTemplateOutput(psOutput, opts) |