From: Guillem Jover Date: Tue, 1 Oct 2024 22:48:05 +0200 Subject: Do not hardcode gopsutil v4 Forwarded: Not-needed Debian-Bug: https://bugs.debian.org/1083117 We can use v4 when no version suffix is used. Remove it so that we can upgrade the gopsutil modules from v3 to v4 in Debian. --- cmd/podman/machine/init.go | 2 +- cmd/podman/machine/server9p.go | 2 +- pkg/machine/e2e/init_test.go | 2 +- pkg/machine/gvproxy_unix.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index a3db264..d5101c7 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -14,7 +14,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/shim" "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/shirou/gopsutil/v4/mem" + "github.com/shirou/gopsutil/mem" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index dae39f7..a24158e 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -11,7 +11,7 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/fileserver" - psutil "github.com/shirou/gopsutil/v4/process" + psutil "github.com/shirou/gopsutil/process" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index 8e3bc72..ccb26a5 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -15,7 +15,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" - "github.com/shirou/gopsutil/v4/mem" + "github.com/shirou/gopsutil/mem" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/gvproxy_unix.go b/pkg/machine/gvproxy_unix.go index da76fc4..f5e2afd 100644 --- a/pkg/machine/gvproxy_unix.go +++ b/pkg/machine/gvproxy_unix.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containers/podman/v5/pkg/machine/define" - psutil "github.com/shirou/gopsutil/v4/process" + psutil "github.com/shirou/gopsutil/process" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" )