From 6bf1923f3ef99e8af2b7adab4890c2550fc4b12d Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 1 Apr 2025 14:41:29 -0700 Subject: [PATCH] pkg/specgen: fix ST1019 on freebsd > pkg/specgen/generate/oci_freebsd.go:15:2: ST1019: package "github.com/opencontainers/runtime-spec/specs-go" is being imported more than once (staticcheck) > "github.com/opencontainers/runtime-spec/specs-go" > ^ > pkg/specgen/generate/oci_freebsd.go:16:2: ST1019(related information): other import of "github.com/opencontainers/runtime-spec/specs-go" (staticcheck) > spec "github.com/opencontainers/runtime-spec/specs-go" > ^ Signed-off-by: Kir Kolyshkin --- pkg/specgen/generate/oci_freebsd.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/specgen/generate/oci_freebsd.go b/pkg/specgen/generate/oci_freebsd.go index 03cc271961..947e48f631 100644 --- a/pkg/specgen/generate/oci_freebsd.go +++ b/pkg/specgen/generate/oci_freebsd.go @@ -12,7 +12,6 @@ import ( "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" - "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" ) @@ -175,6 +174,6 @@ func WeightDevices(wtDevices map[string]spec.LinuxWeightDevice) ([]spec.LinuxWei return devs, nil } -func subNegativeOne(u specs.POSIXRlimit) specs.POSIXRlimit { +func subNegativeOne(u spec.POSIXRlimit) spec.POSIXRlimit { return u }