New: [rhinstaller/blivet/pulls/184 master] Misc 20150728

[dashea]

These are just some random things I had laying around.

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

[dashea]

From: David Lehman

---
 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

[master 2/3] Only check disks for membership in a multipath.

[dashea]

From: David Lehman

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

diff --git a/blivet/populator.py b/blivet/populator.py
index 0b0729d..9f82e9f 100644
--- a/blivet/populator.py
+++ b/blivet/populator.py
@@ -1336,7 +1336,8 @@ def handleUdevDeviceFormat(self, info, device):
         format_type = udev.device_get_format(info)
         serial = udev.device_get_serial(info)

-        is_multipath_member = blockdev.mpath.is_mpath_member(device.path)
+        is_multipath_member = (device.isDisk and
+                               blockdev.mpath_is_mpath_member(device.path))
         if is_multipath_member:
             format_type = "multipath_member"

[master 3/3] Don't warn about missing UUIDs for non-existent containers.

[dashea]

From: David Lehman

It's not possible for the container or its members to have UUIDs
until they have been created.
---
 blivet/devices/container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blivet/devices/container.py b/blivet/devices/container.py
index 0de6ca7..bd5353c 100644
--- a/blivet/devices/container.py
+++ b/blivet/devices/container.py
@@ -84,7 +84,7 @@ def _verifyMemberUuid(self, member, expect_equality=True, require_existence=True
         member_fmt_uuid = getattr(member.format, self._formatUUIDAttr)

# If either UUID can not be obtained, nothing to check.
-        if not member_fmt_uuid or not self.uuid:
+        if self.exists and (not member_fmt_uuid or not self.uuid):
             log.warning("At least one UUID missing.")
             return None

[rhinstaller/blivet/pulls/184 master] Misc 20150728

[dashea]

These all look good to me.

[rhinstaller/blivet/pulls/184 master] Misc 20150728

[dashea]

Added label: ACK.

[rhinstaller/blivet/pulls/184 master] Misc 20150728

[dashea]

Closed.