[master 1/3] Only update md array name if MD_DEVNAME is set. (#1212073)

dwlehman installerbot-noreply at redhat.com
Tue Jul 28 21:16:20 UTC 2015


From: David Lehman <dlehman at redhat.com>

---
 blivet/populator.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/blivet/populator.py b/blivet/populator.py
index 5ff972b..0b0729d 100644
--- a/blivet/populator.py
+++ b/blivet/populator.py
@@ -373,11 +373,12 @@ def addUdevMDDevice(self, info):
             else:
                 device = self.getDeviceByUuid(uuid, incomplete=flags.allow_imperfect_devices)
 
-        if device:
+        if device and name:
             # update the device instance with the real name in case we had to
             # look it up by something other than name
             device.name = name
-        else:
+
+        if device is None:
             # if we get here, we found all of the slave devices and
             # something must be wrong -- if all of the slaves are in
             # the tree, this device should be as well


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/df9ff81cfd597870f4fa153b21e9b79c29ca7d27


More information about the anaconda-patches mailing list