diff options
author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2019-03-21 13:12:26 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-03-24 18:44:58 -0700 |
commit | f8af6c4c16ffee91375bc42b577bc1a417b27540 (patch) | |
tree | 1cb2386c31f9b3681047831c4e3bde465a23d011 | |
parent | af237f985f9cdf5c83390ec7a6be00031852c241 (diff) | |
download | meta-openembedded-f8af6c4c16ffee91375bc42b577bc1a417b27540.tar.gz |
python3-blivetgui: Fix _supported_filesystems crash
Fix the following error when attempting to use blivet-gui in anaconda:
Traceback (most recent call first):
File "/usr/lib64/python3.5/site-packages/blivetgui/blivetgui.py", line 153, in supported_filesystems
if self._supported_filesystems:
File "/usr/lib64/python3.5/site-packages/blivetgui/blivetgui.py", line 456, in add_device
supported_filesystems=self.supported_filesystems,
AttributeError: 'BlivetGUIAnaconda' object has no attribute '_supported_filesystems'
Reference:
https://github.com/storaged-project/blivet-gui/pull/100/
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch new file mode 100644 index 000000000..25a71d4a7 --- /dev/null +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a7b76f783608033e449ba1e33d040c2b40c01a4d Mon Sep 17 00:00:00 2001 | ||
2 | From: Adam Williamson <awilliam@redhat.com> | ||
3 | Date: Wed, 17 Jan 2018 10:38:18 -0800 | ||
4 | Subject: [PATCH] Set _supported_filesystems in BlivetGUIAnaconda init | ||
5 | |||
6 | BlivetGUIAnaconda subclasses BlivetGUI, but doesn't call the | ||
7 | parent class's __init__. c4b6e174 added supported_filesystems | ||
8 | to BlivetGUI and set _supported_filesystems for caching during | ||
9 | __init__, but this was not also added to BlivetGUIAnaconda, so | ||
10 | when anything tries to use the supported_filesystems property | ||
11 | of a BlivetGUIAnaconda instance, it will crash. This is causing | ||
12 | all attempts to use blivet-gui in anaconda to crash since 2.1.8 | ||
13 | landed in Rawhide. | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui] | ||
16 | |||
17 | Signed-off-by: Adam Williamson <awilliam@redhat.com> | ||
18 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
19 | --- | ||
20 | blivetgui/osinstall.py | 3 +++ | ||
21 | 1 file changed, 3 insertions(+) | ||
22 | |||
23 | diff --git a/blivetgui/osinstall.py b/blivetgui/osinstall.py | ||
24 | index 21806ca..32ff66b 100644 | ||
25 | --- a/blivetgui/osinstall.py | ||
26 | +++ b/blivetgui/osinstall.py | ||
27 | @@ -94,6 +94,9 @@ class BlivetGUIAnaconda(BlivetGUI): | ||
28 | self.builder.set_translation_domain("blivet-gui") | ||
29 | self.builder.add_from_file(locate_ui_file("blivet-gui.ui")) | ||
30 | |||
31 | + # supported filesystems | ||
32 | + self._supported_filesystems = [] | ||
33 | + | ||
34 | # CSS styles | ||
35 | css_provider = Gtk.CssProvider() | ||
36 | css_provider.load_from_path(locate_css_file("rectangle.css")) | ||
37 | -- | ||
38 | 2.20.1 | ||
39 | |||
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb index 91f0dff71..5f62b9e5c 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb | |||
@@ -10,6 +10,7 @@ B = "${S}" | |||
10 | 10 | ||
11 | SRCREV = "a4fd427ee2acc5a8f5fb030bf7816917cee63bd8" | 11 | SRCREV = "a4fd427ee2acc5a8f5fb030bf7816917cee63bd8" |
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-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | inherit distro_features_check | 16 | inherit distro_features_check |