summaryrefslogtreecommitdiff
path: root/pkg/bindings/images
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2022-06-14 18:58:53 +0000
committerGitHub <noreply@github.com>2022-06-14 18:58:53 +0000
commite084f0ee1e1ded564110e84eefca9f18b5669adf (patch)
tree61903e09229733fbb6e4674ce983745268720703 /pkg/bindings/images
parent4018a9575e616ebcb3e5232c5d7c81ad6cadfc99 (diff)
parent41528739cef3d2b61e9b7437f6c557e60dbb79c0 (diff)
downloadpodman-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/bindings/images')
-rw-r--r--pkg/bindings/images/build.go2
-rw-r--r--pkg/bindings/images/build_unix.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 72fed6bd5..f14f866dd 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -621,7 +621,7 @@ func nTar(excludes []string, sources ...string) (io.ReadCloser, error) {
}
name := filepath.ToSlash(strings.TrimPrefix(path, s+string(filepath.Separator)))
- excluded, err := pm.Matches(name) // nolint:staticcheck
+ excluded, err := pm.Matches(name) //nolint:staticcheck
if err != nil {
return errors.Wrapf(err, "error checking if %q is excluded", name)
}
diff --git a/pkg/bindings/images/build_unix.go b/pkg/bindings/images/build_unix.go
index 32e2ba9af..07bb8cbcd 100644
--- a/pkg/bindings/images/build_unix.go
+++ b/pkg/bindings/images/build_unix.go
@@ -11,7 +11,7 @@ import (
func checkHardLink(fi os.FileInfo) (devino, bool) {
st := fi.Sys().(*syscall.Stat_t)
return devino{
- Dev: uint64(st.Dev), // nolint: unconvert
+ Dev: uint64(st.Dev), //nolint: unconvert
Ino: st.Ino,
}, st.Nlink > 1
}