diff options
| author | baude <bbaude@redhat.com> | 2019-07-22 13:08:06 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-07-22 15:44:04 -0500 |
| commit | 0c3038d4b5479e475217f2990107f376024d5726 (patch) | |
| tree | fa0936d65d105c8943f40366b0bcb3685d8c0f12 /pkg | |
| parent | ab7b47ca60da11f9e24688cfe2ae3d00eb123471 (diff) | |
| download | podman-0c3038d4b5479e475217f2990107f376024d5726.tar.gz podman-0c3038d4b5479e475217f2990107f376024d5726.tar.bz2 podman-0c3038d4b5479e475217f2990107f376024d5726.zip | |
golangci-lint phase 4
clean up some final linter issues and add a make target for
golangci-lint. in addition, begin running the tests are part of the
gating tasks in cirrus ci.
we cannot fully shift over to the new linter until we fix the image on
the openshift side. for short term, we will use both
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/terminal_linux.go | 2 | ||||
| -rw-r--r-- | pkg/util/utils_linux.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go index 9f6ddc2e6..533a8baf5 100644 --- a/pkg/adapter/terminal_linux.go +++ b/pkg/adapter/terminal_linux.go @@ -16,7 +16,7 @@ import ( // StartAttachCtr starts and (if required) attaches to a container // if you change the signature of this function from os.File to io.Writer, it will trigger a downstream // error. we may need to just lint disable this one. -func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool, recursive bool) error { +func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool, recursive bool) error { //nolint-interfacer resize := make(chan remotecommand.TerminalSize) haveTerminal := terminal.IsTerminal(int(os.Stdin.Fd())) diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index 318bd2b1b..288137ca5 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -39,8 +39,8 @@ func FindDeviceNodes() (map[string]string, error) { if !ok { return errors.Errorf("Could not convert stat output for use") } - major := uint64(sysstat.Rdev / 256) - minor := uint64(sysstat.Rdev % 256) + major := sysstat.Rdev / 256 + minor := sysstat.Rdev % 256 nodes[fmt.Sprintf("%d:%d", major, minor)] = path |