[PATCH 3/3] Clarify name of function that identifies biosraid member devices.

[David Lehman <dlehman@xxxxxxxxxx>]

udev_device_is_biosraid -> udev_device_is_biosraid_member
---
 pyanaconda/iw/filter_gui.py      |    2 +-
 pyanaconda/storage/devicetree.py |    6 +++---
 pyanaconda/storage/udev.py       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py
index aa0e9f0..f6b2995 100644
--- a/pyanaconda/iw/filter_gui.py
+++ b/pyanaconda/iw/filter_gui.py
@@ -105,7 +105,7 @@ def isCCISS(info):
 
 def isRAID(info):
     if flags.dmraid:
-        return udev_device_is_biosraid(info)
+        return udev_device_is_biosraid_member(info)
 
     return False
 
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index ab88305..29ffea5 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -1264,7 +1264,7 @@ class DeviceTree(object):
             log.debug("%s is a cdrom" % name)
             if device is None:
                 device = self.addUdevOpticalDevice(info)
-        elif udev_device_is_biosraid(info) and udev_device_is_disk(info):
+        elif udev_device_is_biosraid_member(info) and udev_device_is_disk(info):
             log.debug("%s is part of a biosraid" % name)
             if device is None:
                 device = DiskDevice(name,
@@ -1733,7 +1733,7 @@ class DeviceTree(object):
         # Now, if the device is a disk, see if there is a usable disklabel.
         # If not, see if the user would like to create one.
         # XXX ignore disklabels on multipath or biosraid member disks
-        if not udev_device_is_biosraid(info) and \
+        if not udev_device_is_biosraid_member(info) and \
            not udev_device_is_multipath_member(info):
             self.handleUdevDiskLabelFormat(info, device)
             if device.partitioned or self.isIgnored(info) or \
@@ -1772,7 +1772,7 @@ class DeviceTree(object):
                 kwargs["mdUuid"] = udev_device_get_md_uuid(info)
             except KeyError:
                 log.debug("mdraid member %s has no md uuid" % name)
-            kwargs["biosraid"] = udev_device_is_biosraid(info)
+            kwargs["biosraid"] = udev_device_is_biosraid_member(info)
         elif format_type == "LVM2_member":
             # lvm
             try:
diff --git a/pyanaconda/storage/udev.py b/pyanaconda/storage/udev.py
index fc34914..31ed68a 100644
--- a/pyanaconda/storage/udev.py
+++ b/pyanaconda/storage/udev.py
@@ -423,7 +423,7 @@ def udev_device_is_dm_mpath(info):
     """ Return True if the device is an. """
     return udev_device_dm_subsystem_match(info, "mpath")
 
-def udev_device_is_biosraid(info):
+def udev_device_is_biosraid_member(info):
     # Note that this function does *not* identify raid sets.
     # Tests to see if device is parto of a dmraid set.
     # dmraid and mdraid have the same ID_FS_USAGE string, ID_FS_TYPE has a
-- 
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list