diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-14 18:58:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 18:58:53 +0000 |
| commit | e084f0ee1e1ded564110e84eefca9f18b5669adf (patch) | |
| tree | 61903e09229733fbb6e4674ce983745268720703 /pkg/domain/infra/tunnel/containers.go | |
| parent | 4018a9575e616ebcb3e5232c5d7c81ad6cadfc99 (diff) | |
| parent | 41528739cef3d2b61e9b7437f6c557e60dbb79c0 (diff) | |
| download | podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.tar.gz podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.tar.bz2 podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.zip | |
Merge pull request #14585 from Luap99/nolint
golangci-lint: enable nolintlint
Diffstat (limited to 'pkg/domain/infra/tunnel/containers.go')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index b68bc46d4..fb0be629c 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -570,7 +570,7 @@ func (ic *ContainerEngine) ContainerExecDetached(ctx context.Context, nameOrID s return sessionID, nil } -func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input, output, errput *os.File) error { //nolint +func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input, output, errput *os.File) error { attachErr := make(chan error) attachReady := make(chan bool) options := new(containers.AttachOptions).WithStream(true) @@ -863,7 +863,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta if eventsErr != nil || lastEvent == nil { logrus.Errorf("Cannot get exit code: %v", err) report.ExitCode = define.ExecErrorCodeNotFound - return &report, nil // nolint: nilerr + return &report, nil //nolint: nilerr } report.ExitCode = lastEvent.ContainerExitCode |