@@ -623,14 +633,17 @@ class CustomPartitioningSpoke(NormalSpoke,
StorageChecker):
error = _("%s cannot be encrypted") % new_fs_type
elif mountpoint == "/" and device.format.exists and not reformat:
error = _("You must create a new filesystem on the root device.")
- elif device_type == DEVICE_TYPE_MD and raid_level in (None,
"single"):
- error = _("Devices of type %s require a valid RAID level
selection.") % _(DEVICE_TEXT_MD)
- if not error and raid_level not in (None, "single"):
- md_level = mdraid.getRaidLevel(raid_level)
- min_disks = md_level.min_members
+ if not error and raid_level is None and requiresRaidSelection(device_type):
+ error = _("Devices of type %s require a valid RAID level
selection.") % _(DEVICE_TEXT_MAP[device_type])
I know this text was in the previous version of the file. It's just
worth pointing out that I don't know what this could possibly do for
translations, but it looks like we've just thrown our hands in the air
on this particular string.
+ if not error and raid_level is not None and raid_level not
in raidLevelsSupported(device_type):
+ error = _("Device of type %s does not support RAID level selection
%s.") % (_(DEVICE_TEXT_MAP[device_type]), raid_level)
Because there's multiple substitutions in this string, it'll need to be
converted to use a dict instead like others in this file. pylint should
complain about this.
- Chris