From b7ceec4867d49ecbd06a7784f0dd8d61592a20a0 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Thu, 8 Apr 2021 23:05:15 +0200 Subject: [PATCH] distro: remove unused field from `distribution` struct The `distribution` struct defined in multiple distributions contained unused `imageTypes` field. Remove it to simplify code. Signed-off-by: Tomas Hozza --- internal/distro/fedora32/distro.go | 2 -- internal/distro/fedora33/distro.go | 2 -- internal/distro/rhel8/distro.go | 2 -- internal/distro/rhel84/distro.go | 2 -- internal/distro/rhel90/distro.go | 2 -- 5 files changed, 10 deletions(-) diff --git a/internal/distro/fedora32/distro.go b/internal/distro/fedora32/distro.go index 2352f6ba2..f129a4321 100644 --- a/internal/distro/fedora32/distro.go +++ b/internal/distro/fedora32/distro.go @@ -22,7 +22,6 @@ const ostreeRef = "fedora/32/%s/iot" type distribution struct { arches map[string]architecture - imageTypes map[string]imageType buildPackages []string } @@ -765,7 +764,6 @@ func New() distro.Distro { } r := distribution{ - imageTypes: map[string]imageType{}, buildPackages: []string{ "dnf", "dosfstools", diff --git a/internal/distro/fedora33/distro.go b/internal/distro/fedora33/distro.go index bd4b983f5..036871844 100644 --- a/internal/distro/fedora33/distro.go +++ b/internal/distro/fedora33/distro.go @@ -22,7 +22,6 @@ const ostreeRef = "fedora/33/%s/iot" type distribution struct { arches map[string]architecture - imageTypes map[string]imageType buildPackages []string } @@ -800,7 +799,6 @@ func New() distro.Distro { } r := distribution{ - imageTypes: map[string]imageType{}, buildPackages: []string{ "dnf", "dosfstools", diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go index 02e391d62..8e91c8dcf 100644 --- a/internal/distro/rhel8/distro.go +++ b/internal/distro/rhel8/distro.go @@ -22,7 +22,6 @@ const ostreeRef = "rhel/8/%s/edge" type distribution struct { arches map[string]architecture - imageTypes map[string]imageType buildPackages []string } @@ -1025,7 +1024,6 @@ func New() distro.Distro { } r := distribution{ - imageTypes: map[string]imageType{}, buildPackages: []string{ "dnf", "dosfstools", diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go index dac243d30..f4e1e017d 100644 --- a/internal/distro/rhel84/distro.go +++ b/internal/distro/rhel84/distro.go @@ -26,7 +26,6 @@ const ostreeRef = "rhel/8/%s/edge" type distribution struct { arches map[string]architecture - imageTypes map[string]distro.ImageType buildPackages []string isCentos bool } @@ -1211,7 +1210,6 @@ func newDistro(isCentos bool) distro.Distro { } r := distribution{ - imageTypes: map[string]distro.ImageType{}, buildPackages: []string{ "dnf", "dosfstools", diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index 66a45c8d2..10adf36d4 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -24,7 +24,6 @@ const modulePlatformID = "platform:el9" type distribution struct { arches map[string]architecture - imageTypes map[string]distro.ImageType buildPackages []string } @@ -801,7 +800,6 @@ func New() distro.Distro { } r := distribution{ - imageTypes: map[string]distro.ImageType{}, buildPackages: []string{ "dnf", "dosfstools",