diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2021-08-03 14:13:39 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-08-06 20:37:42 -0700 |
| commit | c704cb00629dd66d20547b592b6add7ff6d2c1aa (patch) | |
| tree | b284fabfcb2b4a3ae02983c8285fdb4211d9ca4b /meta-python | |
| parent | 88efe3c0ea78196b53d0c6606887b9cf72ca632c (diff) | |
| download | meta-openembedded-contrib-c704cb00629dd66d20547b592b6add7ff6d2c1aa.tar.gz | |
python3-blivetgui: 2.1.10 -> 2.2.1
Upgrade python3-blivetgui from 2.1.10 to 2.2.1.
* drop backported patch
0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Diffstat (limited to 'meta-python')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch | 32 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb (renamed from meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb) | 6 |
2 files changed, 2 insertions, 36 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 deleted file mode 100644 index cf80566854..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb index 4f5856d1b2..ad3c0730f7 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" -SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ - file://0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch \ -" +SRCREV = "adb6bd69fb3cfa709265db66ddcee04c0b5e070f" +SRC_URI = "git://github.com/storaged-project/blivet-gui.git" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" |