summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch32
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch
new file mode 100644
index 0000000000..cf80566854
--- /dev/null
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch
@@ -0,0 +1,32 @@
1From 4d0f9f961704bc1dd83fdf6808fb6ab91dc6a768 Mon Sep 17 00:00:00 2001
2From: Vojtech Trefny <vtrefny@redhat.com>
3Date: Thu, 13 Dec 2018 13:39:03 +0100
4Subject: [PATCH] Fix return type of BlivetUtils.get_disks (#1658893)
5
6This must be a list, not a generator, because we are iterating
7over it multiple times in some cases.
8
9Upstream-Status: Backport[git://github.com/rhinstaller/blivet-gui]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13---
14 blivetgui/blivet_utils.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py
18index e2bd802..ddb04fc 100644
19--- a/blivetgui/blivet_utils.py
20+++ b/blivetgui/blivet_utils.py
21@@ -204,7 +204,7 @@ class BlivetUtils(object):
22
23 """
24
25- return (device for device in self.storage.disks if device.type != "mdarray")
26+ return [device for device in self.storage.disks if device.type != "mdarray"]
27
28 def get_group_devices(self):
29 """ Return list of LVM2 Volume Group devices
30--
312.7.4
32
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb
index 2ea810327d..b7e2493c32 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb
@@ -10,6 +10,7 @@ B = "${S}"
10 10
11SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" 11SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd"
12SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ 12SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \
13 file://0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch \
13" 14"
14 15
15inherit distro_features_check 16inherit distro_features_check