Skip to content

Commit

Permalink
python3-blivetgui: Fix _supported_filesystems crash
Browse files Browse the repository at this point in the history
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:
storaged-project/blivet-gui#100

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
  • Loading branch information
opanait-wr authored and akuster committed Mar 25, 2019
1 parent af237f9 commit f8af6c4
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From a7b76f783608033e449ba1e33d040c2b40c01a4d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 17 Jan 2018 10:38:18 -0800
Subject: [PATCH] Set _supported_filesystems in BlivetGUIAnaconda init

BlivetGUIAnaconda subclasses BlivetGUI, but doesn't call the
parent class's __init__. c4b6e174 added supported_filesystems
to BlivetGUI and set _supported_filesystems for caching during
__init__, but this was not also added to BlivetGUIAnaconda, so
when anything tries to use the supported_filesystems property
of a BlivetGUIAnaconda instance, it will crash. This is causing
all attempts to use blivet-gui in anaconda to crash since 2.1.8
landed in Rawhide.

Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui]

Signed-off-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
blivetgui/osinstall.py | 3 +++
1 file changed, 3 insertions(+)

diff --git a/blivetgui/osinstall.py b/blivetgui/osinstall.py
index 21806ca..32ff66b 100644
--- a/blivetgui/osinstall.py
+++ b/blivetgui/osinstall.py
@@ -94,6 +94,9 @@ class BlivetGUIAnaconda(BlivetGUI):
self.builder.set_translation_domain("blivet-gui")
self.builder.add_from_file(locate_ui_file("blivet-gui.ui"))

+ # supported filesystems
+ self._supported_filesystems = []
+
# CSS styles
css_provider = Gtk.CssProvider()
css_provider.load_from_path(locate_css_file("rectangle.css"))
--
2.20.1

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ B = "${S}"

SRCREV = "a4fd427ee2acc5a8f5fb030bf7816917cee63bd8"
SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \
file://0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch \
"

inherit distro_features_check
Expand Down

0 comments on commit f8af6c4

Please sign in to comment.