diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-07-09 21:30:59 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:28:20 -0700 |
commit | ec273fe1e41e839592b11d61189e5777d2f821ca (patch) | |
tree | e71943b25ea096558eb9c1f1c8c9cc6db42876f5 /meta-python/recipes-extended | |
parent | 583ffd416c17fba04345d9ba6cad1001e1509eb6 (diff) | |
download | meta-openembedded-ec273fe1e41e839592b11d61189e5777d2f821ca.tar.gz |
python3-blivetgui: fix blivet-gui broken
In target installer anaconda 30, when they try to go to blivet-gui,
anaconda.log shows a traceback:
23:02:49,842 INF threading: Thread Done: AnaExecuteStorageThread (140274838624000)
23:02:49,844 DBG exception: running handleException
23:02:49,845 CRT exception: Traceback (most recent call last):
File "/usr/lib/python3.7/site-packages/blivetgui/list_devices.py", line 165, in on_disk_selection_changed
selection.select_iter(self.last_iter)
TypeError: Argument 1 does not allow None as a value
23:02:49,845 DBG exception: Gtk running, queuing exception handler to the main loop
23:02:49,858 DBG ui.common: Entered spoke: BlivetGuiSpoke
23:02:49,858 DBG exception: running handleException
23:02:49,859 CRT exception: Traceback (most recent call last):
File "/usr/lib/python3.7/site-packages/blivetgui/list_devices.py", line 165, in on_disk_selection_changed
selection.select_iter(self.last_iter)
TypeError: Argument 1 does not allow None as a value
Backport a patch from upstream could fix the issue
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended')
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 000000000..cf8056685 --- /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 @@ | |||
1 | From 4d0f9f961704bc1dd83fdf6808fb6ab91dc6a768 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vojtech Trefny <vtrefny@redhat.com> | ||
3 | Date: Thu, 13 Dec 2018 13:39:03 +0100 | ||
4 | Subject: [PATCH] Fix return type of BlivetUtils.get_disks (#1658893) | ||
5 | |||
6 | This must be a list, not a generator, because we are iterating | ||
7 | over it multiple times in some cases. | ||
8 | |||
9 | Upstream-Status: Backport[git://github.com/rhinstaller/blivet-gui] | ||
10 | |||
11 | Signed-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 | |||
17 | diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py | ||
18 | index 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 | -- | ||
31 | 2.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 2ea810327..b7e2493c3 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 | ||
11 | SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" | 11 | SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" |
12 | SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ | 12 | SRC_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 | ||
15 | inherit distro_features_check | 16 | inherit distro_features_check |