[rhel6-branch] fix duplicate raid error message on unsupported arch (#811197)

[Brian C. Lane]

From: Kamalesh Babulal

This patch moves the raid runlevel check, dependent on if
arch supports raid bootable devices.

Resolves: rhbz#811197

Signed-off-by: Brian C. Lane 
---
 platform.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform.py b/platform.py
index 31552ab..8c1f603 100644
--- a/platform.py
+++ b/platform.py
@@ -114,16 +114,16 @@ class Platform(object):
         if not req:
             return [_("You have not created a bootable partition.")]

-        if req.type == "mdarray" and req.level != 1:
-            errors.append(_("Bootable partitions can only be on RAID1 devices."))
-
         # most arches can't have boot on a logical volume
         if req.type == "lvmlv" and not self.supportsLvmBoot:
             errors.append(_("Bootable partitions cannot be on a logical volume."))

# most arches can't have boot on RAID
-        if req.type == "mdarray" and not self.supportsMdRaidBoot:
-            errors.append(_("Bootable partitions cannot be on a RAID device."))
+        if req.type == "mdarray":
+            if not self.supportsMdRaidBoot:
+                errors.append(_("Bootable partitions cannot be on a RAID device."))
+            elif req.level != 1:
+                errors.append(_("Bootable partitions can only be on RAID1 devices."))

# Make sure /boot is on a supported FS type.  This prevents crazy
         # things like boot on vfat.

[Vratislav Podzimek]

Looks good to me.

On Fri, 2012-09-28 at 13:47 -0700, Brian C. Lane wrote:
> From: Kamalesh Babulal
>
> This patch moves the raid runlevel check, dependent on if
> arch supports raid bootable devices.
>
> Resolves: rhbz#811197
> Signed-off-by: Brian C. Lane
>
> platform.py | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/platform.py b/platform.py
> index 31552ab..8c1f603 100644
> --- a/platform.py
> +++ b/platform.py
> @@ -114,16 +114,16 @@ class Platform(object):
>          if not req:
>              return [_("You have not created a bootable partition.")]
>    if req.type == "mdarray" and req.level != 1:
>        errors.append(_("Bootable partitions can only be on RAID1 devices."))
>    # most arches can't have boot on a logical volume
>    if req.type == "lvmlv" and not self.supportsLvmBoot:
>        errors.append(_("Bootable partitions cannot be on a logical volume."))
>
>    # most arches can't have boot on RAID
>    if req.type == "mdarray" and not self.supportsMdRaidBoot:
>        errors.append(_("Bootable partitions cannot be on a RAID device."))
>    if req.type == "mdarray":
>        if not self.supportsMdRaidBoot:
>            errors.append(_("Bootable partitions cannot be on a RAID device."))
>        elif req.level != 1:
>            errors.append(_("Bootable partitions can only be on RAID1 devices."))
>
>    # Make sure /boot is on a supported FS type.  This prevents crazy
>    # things like boot on vfat.