diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-03-21 14:49:47 +0100 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-03-22 13:04:35 +0100 |
| commit | 0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb (patch) | |
| tree | 1fb296cb38e545e367824532bc0e3d2a8ace6a54 /libpod/oci_conmon_linux.go | |
| parent | 081e09143747b01c15071ba1bf80cafe60f5818e (diff) | |
| download | podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.tar.gz podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.tar.bz2 podman-0f12b6fe55f6b5ce70d8c388ec2df35db9feffbb.zip | |
linter: enable nilerr
A number of cases looked suspicious, so I marked them with `FIXME`s to
leave some breadcrumbs.
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 66123dbf4..ba4079bed 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -750,7 +750,7 @@ func openControlFile(ctr *Container, parentDir string) (*os.File, error) { for i := 0; i < 600; i++ { controlFile, err := os.OpenFile(controlPath, unix.O_WRONLY|unix.O_NONBLOCK, 0) if err == nil { - return controlFile, err + return controlFile, nil } if !isRetryable(err) { return nil, errors.Wrapf(err, "could not open ctl file for terminal resize for container %s", ctr.ID()) @@ -1015,7 +1015,8 @@ func (r *ConmonOCIRuntime) getLogTag(ctr *Container) (string, error) { } data, err := ctr.inspectLocked(false) if err != nil { - return "", nil + // FIXME: this error should probably be returned + return "", nil // nolint: nilerr } tmpl, err := template.New("container").Parse(logTag) if err != nil { |