opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 00:27:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update golangci-lint to v2.1.1

Browse Source 
Fixes three new issues found by nilnesserr.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-04-14 19:33:42 +02:00
parent f64204f651
commit f26765ceb0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -61,7 +61,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
# N/B: This value is managed by Renovate, manual changes are # N/B: This value is managed by Renovate, manual changes are
# possible, as long as they don't disturb the formatting # possible, as long as they don't disturb the formatting
# (i.e. DO NOT ADD A 'v' prefix!) # (i.e. DO NOT ADD A 'v' prefix!)
GOLANGCI_LINT_VERSION := 2.0.2 GOLANGCI_LINT_VERSION := 2.1.1
PYTHON ?= $(shell command -v python3 python|head -n1) PYTHON ?= $(shell command -v python3 python|head -n1)
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1) PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
# ~/.local/bin is not in PATH on all systems # ~/.local/bin is not in PATH on all systems

2
pkg/api/handlers/compat/events.go
View File

@ -85,7 +85,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
return return
} }
if evt.Error != nil { if evt.Error != nil {
logrus.Errorf("Unable to read event: %q", err) logrus.Errorf("Unable to read event: %q", evt.Error)
continue continue
} }
if evt.Event == nil { if evt.Event == nil {

2
pkg/api/handlers/libpod/pods.go
View File

@ -167,7 +167,7 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
responses, stopError = pod.Stop(r.Context(), false) responses, stopError = pod.Stop(r.Context(), false)
} }
if stopError != nil && !errors.Is(stopError, define.ErrPodPartialFail) { if stopError != nil && !errors.Is(stopError, define.ErrPodPartialFail) {
utils.Error(w, http.StatusInternalServerError, err) utils.Error(w, http.StatusInternalServerError, stopError)
return return
} }
// Try to clean up the pod - but only warn on failure, it's nonfatal. // Try to clean up the pod - but only warn on failure, it's nonfatal.

2
pkg/bindings/manifests/manifests.go
View File

@ -431,7 +431,7 @@ func Modify(ctx context.Context, name string, images []string, options *ModifyOp
artifactWriterGroup.Wait() artifactWriterGroup.Wait()
if artifactWriterError != nil { if artifactWriterError != nil {
return "", fmt.Errorf("uploading artifacts: %w", err) return "", fmt.Errorf("uploading artifacts: %w", artifactWriterError)
} }
data, err := io.ReadAll(response.Body) data, err := io.ReadAll(response.Body)