Only call mpath plugin when it is available. (#1697378)

0001-Only-call-mpath-plugin-when-it-is-available.-1697378.patch

@@ -0,0 +1,33 @@
+From dfeaf948d05c20a243c64589970f45ae98b94dfb Mon Sep 17 00:00:00 2001
+From: David Lehman <dlehman@redhat.com>
+Date: Thu, 2 May 2019 13:03:54 -0400
+Subject: [PATCH] Only call mpath plugin when it is available. (#1697378)
+
+---
+ blivet/populator/populator.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/blivet/populator/populator.py b/blivet/populator/populator.py
+index cdb5b79f..ebe205e6 100644
+--- a/blivet/populator/populator.py
++++ b/blivet/populator/populator.py
+@@ -44,6 +44,7 @@ from .. import udev
+ from .. import util
+ from ..flags import flags
+ from ..storage_log import log_method_call
++from ..tasks import availability
+ from ..threads import SynchronizedMeta
+ from .helpers import get_device_helper, get_format_helper
+ from ..static_data import lvs_info, pvs_info, luks_data, mpath_members
+@@ -426,7 +427,7 @@ class PopulatorMixin(object):
+         self.drop_lvm_cache()
+         mpath_members.drop_cache()
+ 
+-        if flags.auto_dev_updates:
++        if flags.auto_dev_updates and availability.BLOCKDEV_MPATH_PLUGIN.available:
+             blockdev.mpath.set_friendly_names(flags.multipath_friendly_names)
+ 
+         self.setup_disk_images()
+-- 
+2.20.1
+

python-blivet.spec

@@ -23,7 +23,7 @@ Version: 3.1.2
 
 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 4%{?prerelease}%{?dist}
+Release: 5%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -34,6 +34,7 @@ Patch0: 0001-force-lvm-plugin.patch
 Patch1: 0002-Dont-crash-if-blockdev-mpath-plugin-isnt-available.patch
 Patch2: 0003-Support-legacy-MBR-as-part-of-UEFI.patch
 Patch3: 0004-Ensure-correct-type-of-mpath-cache-member-list.patch
+Patch4: 0001-Only-call-mpath-plugin-when-it-is-available.-1697378.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -194,6 +195,9 @@ configuration.
 %endif
 
 %changelog
+* Wed May 08 2019 David Lehman <dlehman@redhat.com> - 3.1.2-5
+- Only call mpath plugin when it is available. (#1697378)
+
 * Thu Mar 21 2019 Vojtech Trefny <vtrefny@redhat.com> - 3.1.2-4
 - Ensure correct type of mpath cache member list