From 7be317fbf71aaeb2dd36d1572fef280c1b8386fc Mon Sep 17 00:00:00 2001 From: David Lehman Date: Tue, 20 Mar 2018 15:49:04 -0400 Subject: [PATCH] Don't use a 'wwn' kwarg for MDBiosRaidArrayDevice (#1557957) (awilliam) --- ...kwarg-for-MDBiosRaidArrayDevice-1557.patch | 32 +++++++++++++++++++ python-blivet.spec | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch diff --git a/0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch b/0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch new file mode 100644 index 0000000..c0e8b99 --- /dev/null +++ b/0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch @@ -0,0 +1,32 @@ +From 9dfe3cfa695f788716655e51915dfb4fa9d8fcd6 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 19 Mar 2018 16:48:38 -0700 +Subject: [PATCH] Don't use a 'wwn' kwarg for MDBiosRaidArrayDevice (#1557957) + +MDBiosRaidArrayDevice's parent class doesn't take a 'wwn' kwarg, +so the populator for it shouldn't pass one. + +For more details, see comment 15 on the bug. + +Resolves: rhbz#1557957 + +Signed-off-by: Adam Williamson +--- + blivet/populator/helpers/disk.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py +index e2757b12..6c03f698 100644 +--- a/blivet/populator/helpers/disk.py ++++ b/blivet/populator/helpers/disk.py +@@ -172,6 +172,7 @@ class MDBiosRaidDevicePopulator(DiskDevicePopulator): + del kwargs["serial"] + del kwargs["vendor"] + del kwargs["bus"] ++ del kwargs["wwn"] + return kwargs + + +-- +2.14.3 + diff --git a/python-blivet.spec b/python-blivet.spec index 342299c..43ac628 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -14,7 +14,7 @@ Version: 3.0.0 %global prerelease .b1 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 0.5%{?prerelease}%{?dist} +Release: 0.6%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries @@ -24,6 +24,7 @@ Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realver Patch0: 0001-Dasd-is-a-valid-label-type-on-s390x.patch Patch1: 0002-Do-not-try-to-update-potfile-during-make-all.patch Patch2: 0003-Allow-device-specification-by-node-to-udev.get_devic.patch +Patch3: 0004-Don-t-use-a-wwn-kwarg-for-MDBiosRaidArrayDevice-1557.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -166,6 +167,9 @@ make PYTHON=%{__python3} DESTDIR=%{buildroot} install %endif %changelog +* Tue Mar 20 2018 David Lehman - 1:3.0.0-0.6.b1 +- Don't use a 'wwn' kwarg for MDBiosRaidArrayDevice (#1557957) (awilliam) + * Sat Mar 17 2018 Iryna Shcherbina - 1:3.0.0-0.5.b1 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)