[blivet:master 07/11] Change use of METADATA to MD_METADATA.
mulhern
amulhern at redhat.com
Thu Jul 3 15:19:46 UTC 2014
Remove useless access before loop and add an explanatory comment.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/devicetree.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 57e0a47..aaa287c 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1582,7 +1582,7 @@ class DeviceTree(object):
log.warning("invalid data for %s: no RAID level", device.name)
return
- md_metadata = info.get("MD_METADATA")
+ md_metadata = None
md_name = None
# check the list of devices udev knows about to see if the array
@@ -1614,8 +1614,9 @@ class DeviceTree(object):
break
- if not md_metadata:
- md_metadata = info.get("METADATA", "0.90")
+ # mdexamine yields MD_METADATA only for metadata version > 0.90
+ # if MD_METADATA is missing, assume metadata version is 0.90
+ md_metadata = md_metadata or info.get("MD_METADATA", "0.90")
if not md_name:
md_path = info.get("DEVICE", "")
--
1.9.3
More information about the anaconda-patches
mailing list