diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-02-11 22:28:35 +0100 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-02-18 11:09:50 -0500 |
| commit | 6470f970154c4d21e591fe18d59d1f471b51b5d7 (patch) | |
| tree | 5927d60cbbe96af91ac8a0ececcc06e01496d2ad /pkg/api/handlers | |
| parent | 3bddeebf930efb872b99966df5553e0baf81834a (diff) | |
| download | podman-6470f970154c4d21e591fe18d59d1f471b51b5d7.tar.gz podman-6470f970154c4d21e591fe18d59d1f471b51b5d7.tar.bz2 podman-6470f970154c4d21e591fe18d59d1f471b51b5d7.zip | |
Enable golint linter
Use the golint linter and fix the reported problems.
[NO TESTS NEEDED]
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'pkg/api/handlers')
| -rw-r--r-- | pkg/api/handlers/compat/containers_archive.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/utils/containers.go | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 083c72ce8..55bd62f90 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -62,7 +62,7 @@ func handleHeadAndGet(w http.ResponseWriter, r *http.Request, decoder *schema.De w.Header().Add(copy.XDockerContainerPathStatHeader, statHeader) } - if errors.Cause(err) == define.ErrNoSuchCtr || errors.Cause(err) == copy.ENOENT { + if errors.Cause(err) == define.ErrNoSuchCtr || errors.Cause(err) == copy.ErrENOENT { // 404 is returned for an absent container and path. The // clients must deal with it accordingly. utils.Error(w, "Not found.", http.StatusNotFound, err) diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 06a668d6f..c3ca6a2fb 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -131,10 +131,9 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) { if errors.Cause(err) == define.ErrNoSuchCtr { ContainerNotFound(w, name, err) return - } else { - InternalServerError(w, err) - return } + InternalServerError(w, err) + return } WriteResponse(w, http.StatusOK, strconv.Itoa(int(exitCode))) } @@ -201,9 +200,8 @@ func waitRemoved(ctrWait containerWaitFn) (int32, error) { code, err := ctrWait(define.ContainerStateUnknown) if err != nil && errors.Cause(err) == define.ErrNoSuchCtr { return code, nil - } else { - return code, err } + return code, err } func waitNextExit(ctrWait containerWaitFn) (int32, error) { |