diff options
Diffstat (limited to 'external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui')
2 files changed, 32 insertions, 39 deletions
diff --git a/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch b/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch new file mode 100644 index 00000000..cf805668 --- /dev/null +++ b/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch @@ -0,0 +1,32 @@ +From 4d0f9f961704bc1dd83fdf6808fb6ab91dc6a768 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Thu, 13 Dec 2018 13:39:03 +0100 +Subject: [PATCH] Fix return type of BlivetUtils.get_disks (#1658893) + +This must be a list, not a generator, because we are iterating +over it multiple times in some cases. + +Upstream-Status: Backport[git://github.com/rhinstaller/blivet-gui] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- + blivetgui/blivet_utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py +index e2bd802..ddb04fc 100644 +--- a/blivetgui/blivet_utils.py ++++ b/blivetgui/blivet_utils.py +@@ -204,7 +204,7 @@ class BlivetUtils(object): + + """ + +- return (device for device in self.storage.disks if device.type != "mdarray") ++ return [device for device in self.storage.disks if device.type != "mdarray"] + + def get_group_devices(self): + """ Return list of LVM2 Volume Group devices +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch b/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch deleted file mode 100644 index 25a71d4a..00000000 --- a/external/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - |