particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ineffectual assignments found by golangci-lint

Browse source
This commit is contained in:
Ondřej Budai 2020-02-14 10:19:28 +01:00 • committed by Tom Gundersen
parent 55d3854033
commit 3ff88c336f
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/fedora30/distro.go
View file

@ -549,7 +549,7 @@ func (r *Fedora30) firewallStageOptions(firewall *blueprint.FirewallCustomizatio
func (r *Fedora30) systemdStageOptions(enabledServices, disabledServices []string, s *blueprint.ServicesCustomization) *pipeline.SystemdStageOptions {
if s != nil {
enabledServices = append(enabledServices, s.Enabled...)
enabledServices = append(disabledServices, s.Disabled...)
disabledServices = append(disabledServices, s.Disabled...)
}
return &pipeline.SystemdStageOptions{
EnabledServices: enabledServices,

3
internal/distro/rhel82/distro.go
View file

@ -441,7 +441,6 @@ func (r *RHEL82) Name() string {
return name
}
func (r *RHEL82) Distribution() common.Distribution {
return Distro
}
@ -692,7 +691,7 @@ func (r *RHEL82) firewallStageOptions(firewall *blueprint.FirewallCustomization)
func (r *RHEL82) systemdStageOptions(enabledServices, disabledServices []string, s *blueprint.ServicesCustomization, target string) *pipeline.SystemdStageOptions {
if s != nil {
enabledServices = append(enabledServices, s.Enabled...)
enabledServices = append(disabledServices, s.Disabled...)
disabledServices = append(disabledServices, s.Disabled...)
}
return &pipeline.SystemdStageOptions{
EnabledServices: enabledServices,