[PATCH 6/6] Simplify udev.device_get_uuid.

David Lehman dlehman at redhat.com
Mon Aug 4 15:15:02 UTC 2014


md members never have MD_UUID set in the udev db.
---
 blivet/udev.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/blivet/udev.py b/blivet/udev.py
index 1592f00..890b05a 100644
--- a/blivet/udev.py
+++ b/blivet/udev.py
@@ -151,12 +151,7 @@ def device_get_uuid(udev_info):
         :returns: a UUID or None
         :rtype: str or NoneType
     """
-    md_uuid = udev_info.get("MD_UUID", '')
-    uuid = udev_info.get("ID_FS_UUID", '')
-    # we don't want to return the array's uuid as a member's uuid
-    if len(uuid) > 0 and \
-            re.sub(r'\W', '', md_uuid) != re.sub(r'\W', '', uuid):
-        return udev_info.get("ID_FS_UUID")
+    return udev_info.get("ID_FS_UUID")
 
 def device_get_label(udev_info):
     """ Get the label from the device's format as reported by udev. """
-- 
1.9.3



More information about the anaconda-patches mailing list