From 1f19a60d9a6b839a8505c9c52f5bd3dd1344a72e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 24 Mar 2022 08:00:03 +0000 Subject: [PATCH] import virt-manager-3.2.0-4.el8 --- ...console-fix-error-with-old-pygobject.patch | 50 +++++++++++++++++++ SPECS/virt-manager.spec | 6 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 SOURCES/virt-manager-console-fix-error-with-old-pygobject.patch diff --git a/SOURCES/virt-manager-console-fix-error-with-old-pygobject.patch b/SOURCES/virt-manager-console-fix-error-with-old-pygobject.patch new file mode 100644 index 0000000..8249749 --- /dev/null +++ b/SOURCES/virt-manager-console-fix-error-with-old-pygobject.patch @@ -0,0 +1,50 @@ +From 61e24e595852a552019912b9a9d6884f5012dc6e Mon Sep 17 00:00:00 2001 +From: Pavel Hrdina +Date: Fri, 5 Feb 2021 12:15:46 +0100 +Subject: [PATCH] console: fix error with old pygobject + +The code doesn't work as expected. From python documentation: + + x and y + +is the same as + + x if not x or y + +so in the code if for some reasone `dev` is None the value stored in +`sensitive` will be None as well. + +No the code itself works with pygobject >= 3.31.3 where they allowed +None as a valid boolean value, but with older versions it will fail +with this error message: + + TypeError: Argument 1 does not allow None as a value + +Resolves: https://github.com/virt-manager/virt-manager/issues/226 + +Signed-off-by: Pavel Hrdina +(cherry picked from commit cf93e2dbff28fe05d6d45364c579f923b157beb1) + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2026987 + +Signed-off-by: Jonathon Jongsma +--- + virtManager/details/console.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/virtManager/details/console.py b/virtManager/details/console.py +index c4ed478ed..18f9ddd91 100644 +--- a/virtManager/details/console.py ++++ b/virtManager/details/console.py +@@ -258,7 +258,7 @@ class _ConsoleMenu: + + cb = toggled_cb + cbdata = dev +- sensitive = dev and not tooltip ++ sensitive = bool(dev and not tooltip) + + active = False + if oldlabel is None and sensitive: +-- +2.35.1 + diff --git a/SPECS/virt-manager.spec b/SPECS/virt-manager.spec index 7a5f086..8fb1ffe 100644 --- a/SPECS/virt-manager.spec +++ b/SPECS/virt-manager.spec @@ -8,7 +8,7 @@ Name: virt-manager Version: 3.2.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} %global verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt @@ -27,6 +27,7 @@ Patch6: virt-manager-virt-manager-enable-MDEV-support.patch Patch7: virt-manager-Handle-new-nodedev-name-for-mediated-devices.patch Patch8: virt-manager-addstorage-Don-t-pass-None-to-widget.set_active.patch Patch9: virt-manager-cli-add-ioapic.driver-to-features.patch +Patch10: virt-manager-console-fix-error-with-old-pygobject.patch Requires: virt-manager-common = %{verrel} @@ -196,6 +197,9 @@ done %changelog +* Thu Mar 10 2022 Jonathon Jongsma - 3.2.0-4 +- console: fix error with old pygobject (rhbz#2026987) + * Fri Jan 21 2022 Jonathon Jongsma - 3.2.0-3 - cli: add 'ioapic.driver' to --features (rhbz#2037202)