From a1766b3cdfc8dfa9f905768d24a3f69b96d7ba67 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 03:03:04 -0400 Subject: [PATCH] import virt-viewer-9.0-12.el8 --- ...less-scary-error-if-there-are-no-ISO.patch | 30 +++++++++++++++++++ SPECS/virt-viewer.spec | 11 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0028-iso-dialog-Give-less-scary-error-if-there-are-no-ISO.patch diff --git a/SOURCES/0028-iso-dialog-Give-less-scary-error-if-there-are-no-ISO.patch b/SOURCES/0028-iso-dialog-Give-less-scary-error-if-there-are-no-ISO.patch new file mode 100644 index 0000000..d542c27 --- /dev/null +++ b/SOURCES/0028-iso-dialog-Give-less-scary-error-if-there-are-no-ISO.patch @@ -0,0 +1,30 @@ +From ff11d5937ef2681f1b2bd58d9bea5854f7ff3c9a Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Thu, 9 Jul 2020 14:27:02 +0100 +Subject: [PATCH] iso-dialog: Give less scary error if there are no ISOs + +Instead of a fail simply reply that there are no ISO files. + +Message text was suggested by Radek Duda who reported the issue. + +Signed-off-by: Frediano Ziglio +--- + src/remote-viewer-iso-list-dialog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/remote-viewer-iso-list-dialog.c b/src/remote-viewer-iso-list-dialog.c +index c6fbe50..c7ee051 100644 +--- a/src/remote-viewer-iso-list-dialog.c ++++ b/src/remote-viewer-iso-list-dialog.c +@@ -153,7 +153,7 @@ fetch_iso_names_cb(OvirtForeignMenu *foreign_menu, + iso_list = ovirt_foreign_menu_fetch_iso_names_finish(foreign_menu, result, &error); + + if (!iso_list) { +- const gchar *msg = error ? error->message : _("Failed to fetch CD names"); ++ const gchar *msg = error ? error->message : _("No ISO files in domain"); + gchar *markup = g_strdup_printf("%s", msg); + + g_debug("Error fetching ISO names: %s", msg); +-- +2.31.1 + diff --git a/SPECS/virt-viewer.spec b/SPECS/virt-viewer.spec index f38a67b..7f62c1f 100644 --- a/SPECS/virt-viewer.spec +++ b/SPECS/virt-viewer.spec @@ -19,7 +19,7 @@ Name: virt-viewer Version: 9.0 -Release: 11%{?dist}%{?extra_release} +Release: 12%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -75,6 +75,9 @@ Patch025: 0025-vnc-session-use-g_signal_connect_object.patch Patch026: 0026-build-fix-build-without-gtk-vnc.patch Patch027: 0027-ovirt-foreign-menu-Support-changing-ISO-from-Data-St.patch +# rhbz#1855716 +Patch028: 0028-iso-dialog-Give-less-scary-error-if-there-are-no-ISO.patch + Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -152,6 +155,8 @@ the display, and libvirt for looking up VNC/SPICE server details. %patch026 -p1 %patch027 -p1 +%patch028 -p1 + %build %if 0%{?enable_autotools} @@ -190,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Sun Oct 31 2021 Uri Lublin - 9.0-12 +- iso-dialog: Give less scary error if there are no ISOs + Resolves: rhbz#1855716 + * Thu Aug 26 2021 Eduardo Lima (Etrunko) - 9.0.11 - Add support for changing ISO fom Data StorageDomain Resolves: rhbz#1835640