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 /libpod/container_internal_linux.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 'libpod/container_internal_linux.go')
-rw-r--r-- | libpod/container_internal_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index eafe3d75e..2f36995b3 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2643,7 +2643,7 @@ func (c *Container) generateUserGroupEntry(addedGID int) (string, error) { gid, err := strconv.ParseUint(group, 10, 32) if err != nil { - return "", nil // nolint: nilerr + return "", nil //nolint: nilerr } if addedGID != 0 && addedGID == int(gid) { @@ -2799,7 +2799,7 @@ func (c *Container) generateUserPasswdEntry(addedUID int) (string, error) { // If a non numeric User, then don't generate passwd uid, err := strconv.ParseUint(userspec, 10, 32) if err != nil { - return "", nil // nolint: nilerr + return "", nil //nolint: nilerr } if addedUID != 0 && int(uid) == addedUID { @@ -3224,7 +3224,7 @@ func (c *Container) fixVolumePermissions(v *ContainerNamedVolume) error { return err } stat := st.Sys().(*syscall.Stat_t) - atime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) // nolint: unconvert + atime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert if err := os.Chtimes(mountPoint, atime, st.ModTime()); err != nil { return err } |