diff --git a/SOURCES/0012-Ensure-correct-type-of-mpath-cache-member-list.patch b/SOURCES/0012-Ensure-correct-type-of-mpath-cache-member-list.patch new file mode 100644 index 0000000..57ee76a --- /dev/null +++ b/SOURCES/0012-Ensure-correct-type-of-mpath-cache-member-list.patch @@ -0,0 +1,31 @@ +From d01281a69e317d7bae4a7698edb6583b6310d5c1 Mon Sep 17 00:00:00 2001 +From: David Lehman +Date: Tue, 19 Mar 2019 11:51:47 -0400 +Subject: [PATCH] Ensure correct type of mpath cache member list. + +Related: rhbz#1672971 +--- + blivet/static_data/mpath_info.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/blivet/static_data/mpath_info.py b/blivet/static_data/mpath_info.py +index 49ba4709..64958ba8 100644 +--- a/blivet/static_data/mpath_info.py ++++ b/blivet/static_data/mpath_info.py +@@ -42,8 +42,11 @@ class MpathMembers(object): + :param str device: path of the device to query + + """ +- if self._members is None and availability.BLOCKDEV_MPATH_PLUGIN.available: +- self._members = set(blockdev.mpath.get_mpath_members()) ++ if self._members is None: ++ if availability.BLOCKDEV_MPATH_PLUGIN.available: ++ self._members = set(blockdev.mpath.get_mpath_members()) ++ else: ++ self._members = set() + + device = os.path.realpath(device) + device = device[len("/dev/"):] +-- +2.20.1 + diff --git a/SPECS/python-blivet.spec b/SPECS/python-blivet.spec index 1492f14..7f8b96a 100644 --- a/SPECS/python-blivet.spec +++ b/SPECS/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.1.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 9%{?prerelease}%{?dist} +Release: 10%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -42,6 +42,7 @@ Patch8: 0008-po-updates.patch Patch9: 0009-Require-libfc-instead-of-fcoe-for-offloaded-FCoE.-15.patch Patch10: 0010-Use-udev-to-determine-if-disk-is-a-multipath-member.patch Patch11: 0011-Don-t-crash-if-blockdev-mpath-plugin-isn-t-available.patch +Patch12: 0012-Ensure-correct-type-of-mpath-cache-member-list.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -202,6 +203,10 @@ configuration. %endif %changelog +* Wed Apr 03 2019 David Lehman - 3.1.0-10 +- Ensure correct type of mpath cache member list. + Related: rhbz#1672971 + * Mon Feb 25 2019 David Lehman - 3.1.0-9 - Update to latest translations. Resolves: rhbz#1608337