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

linter: enable nilerr

Browse Source 
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>
This commit is contained in:
Valentin Rothberg
2022-03-21 14:49:47 +01:00
parent 081e091437
commit 0f12b6fe55
21 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/rootless/rootless.go
View File

@ -16,12 +16,15 @@ import (
// file.
func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
if _, err := os.Stat(pausePidPath); err != nil {
return false, -1, nil
if os.IsNotExist(err) {
return false, -1, nil
}
return false, -1, err
}
became, ret, err := TryJoinFromFilePaths("", false, []string{pausePidPath})
if err == nil {
return became, ret, err
return became, ret, nil
}
// It could not join the pause process, let's lock the file before trying to delete it.
@ -46,7 +49,7 @@ func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
if err != nil {
// It is still failing. We can safely remove it.
os.Remove(pausePidPath)
return false, -1, nil
return false, -1, nil // nolint: nilerr
}
return became, ret, err
}