[master] Fix RAID level test

Brian C. Lane bcl at redhat.com
Wed Feb 20 20:12:45 UTC 2013


From: "Brian C. Lane" <bcl at redhat.com>

The string needs to be converted to a raid level before passing it to
blivet.
---
 pyanaconda/ui/gui/spokes/custom.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index ddddcb3..ba93b72 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1353,11 +1353,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         # what is the incremental disk space requirement for this feature?
         # TODO: update this when the size spinner changes
-        level = self._get_raid_level()
-        min_disks = mdraid.get_raid_min_members(level)
-        if min_disks <= len(factory.disks):
-            factory.raid_level = level
-            delta = factory.device_size - base_size
+        raid_level = self._get_raid_level()
+        if raid_level not in (None, "single"):
+            md_level = mdraid.raidLevel(raid_level)
+            min_disks = mdraid.get_raid_min_members(md_level)
+            if min_disks <= len(factory.disks):
+                factory.raid_level = md_level
+                delta = factory.device_size - base_size
 
     def _get_current_device_type(self):
         typeCombo = self.builder.get_object("deviceTypeCombo")
-- 
1.8.1



More information about the anaconda-patches mailing list