distro: flip the installer customization check order

Co-authored-by: Michael Vogt <[email protected]>
osbuild · May 16, 2024 · c3c840c · c3c840c
1 parent d6a04d5
commit c3c840c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/pkg/distro/fedora/imagetype.go b/pkg/distro/fedora/imagetype.go
@@ -418,7 +418,11 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 		return []string{w}, nil
 	}
 
-	if instCust, err := customizations.GetInstaller(); instCust != nil {
+	instCust, err := customizations.GetInstaller()
+	if err != nil {
+		return nil, err
+	}
+	if instCust != nil {
 		// only supported by the Anaconda installer
 		if slices.Index([]string{"iot-installer"}, t.name) == -1 {
 			return nil, fmt.Errorf("installer customizations are not supported for %q", t.Name())
@@ -434,8 +438,6 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 			(customizations.GetUsers() != nil || customizations.GetGroups() != nil) {
 			return nil, fmt.Errorf("iot-installer installer.kickstart.contents are not supported in combination with users or groups")
 		}
-	} else if err != nil {
-		return nil, err
 	}
 
 	return nil, nil

diff --git a/pkg/distro/rhel/rhel10/options.go b/pkg/distro/rhel/rhel10/options.go
@@ -81,13 +81,15 @@ func checkOptions(t *rhel.ImageType, bp *blueprint.Blueprint, options distro.Ima
 		warnings = append(warnings, w)
 	}
 
-	if instCust, err := customizations.GetInstaller(); instCust != nil {
+	instCust, err := customizations.GetInstaller()
+	if err != nil {
+		return warnings, err
+	}
+	if instCust != nil {
 		// only supported by the Anaconda installer
 		if slices.Index([]string{"image-installer", "edge-installer", "live-installer"}, t.Name()) == -1 {
 			return warnings, fmt.Errorf("installer customizations are not supported for %q", t.Name())
 		}
-	} else if err != nil {
-		return warnings, err
 	}
 
 	return warnings, nil

diff --git a/pkg/distro/rhel/rhel8/options.go b/pkg/distro/rhel/rhel8/options.go
@@ -175,7 +175,11 @@ func checkOptions(t *rhel.ImageType, bp *blueprint.Blueprint, options distro.Ima
 		warnings = append(warnings, w)
 	}
 
-	if instCust, err := customizations.GetInstaller(); instCust != nil {
+	instCust, err := customizations.GetInstaller()
+	if err != nil {
+		return warnings, err
+	}
+	if instCust != nil {
 		// only supported by the Anaconda installer
 		if slices.Index([]string{"image-installer", "edge-installer", "live-installer"}, t.Name()) == -1 {
 			return warnings, fmt.Errorf("installer customizations are not supported for %q", t.Name())
@@ -187,8 +191,6 @@ func checkOptions(t *rhel.ImageType, bp *blueprint.Blueprint, options distro.Ima
 			(customizations.GetUsers() != nil || customizations.GetGroups() != nil) {
 			return warnings, fmt.Errorf("edge-installer installer.kickstart.contents are not supported in combination with users or groups")
 		}
-	} else if err != nil {
-		return warnings, err
 	}
 
 	return warnings, nil

diff --git a/pkg/distro/rhel/rhel9/options.go b/pkg/distro/rhel/rhel9/options.go
@@ -194,7 +194,11 @@ func checkOptions(t *rhel.ImageType, bp *blueprint.Blueprint, options distro.Ima
 		warnings = append(warnings, w)
 	}
 
-	if instCust, err := customizations.GetInstaller(); instCust != nil {
+	instCust, err := customizations.GetInstaller()
+	if err != nil {
+		return warnings, err
+	}
+	if instCust != nil {
 		// only supported by the Anaconda installer
 		if slices.Index([]string{"image-installer", "edge-installer", "live-installer"}, t.Name()) == -1 {
 			return warnings, fmt.Errorf("installer customizations are not supported for %q", t.Name())
@@ -206,8 +210,6 @@ func checkOptions(t *rhel.ImageType, bp *blueprint.Blueprint, options distro.Ima
 			(customizations.GetUsers() != nil || customizations.GetGroups() != nil) {
 			return warnings, fmt.Errorf("edge-installer installer.kickstart.contents are not supported in combination with users or groups")
 		}
-	} else if err != nil {
-		return warnings, err
 	}
 
 	return warnings, nil