From b24d42f17f575fee36d7eb45cbe396be9a8ac22989c59f36e3c01ff89ae74f0d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Apr 2022 14:56:26 +0000 Subject: [PATCH] Accepting request 967812 from GNOME:Next - Add 8cbce25.patch: Fix Gnome-Software keep poping up notification "Software updates failed". OBS-URL: https://build.opensuse.org/request/show/967812 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=214 --- 8cbce25.patch | 33 +++++++++++++++++++++++++++++++++ gnome-software.changes | 6 ++++++ gnome-software.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 8cbce25.patch diff --git a/8cbce25.patch b/8cbce25.patch new file mode 100644 index 0000000..c4e10ba --- /dev/null +++ b/8cbce25.patch @@ -0,0 +1,33 @@ +From 8cbce258c3ed1e581477ce56972c9ce9c6225aa5 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Mon, 28 Mar 2022 11:32:10 +0100 +Subject: [PATCH] gs-update-monitor: Ignore G_IO_ERROR_CANCELLED for historical + updates + +Signed-off-by: Philip Withnall + +Helps: #1693 +--- + src/gs-update-monitor.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c +index a8d3e014c..bf7dbf683 100644 +--- a/src/gs-update-monitor.c ++++ b/src/gs-update-monitor.c +@@ -1125,6 +1125,12 @@ get_updates_historical_cb (GObject *object, GAsyncResult *res, gpointer data) + /* get result */ + apps = gs_plugin_loader_job_process_finish (GS_PLUGIN_LOADER (object), res, &error); + if (apps == NULL) { ++ if (g_error_matches (error, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_CANCELLED) || ++ g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { ++ g_debug ("Failed to get historical updates: %s", error->message); ++ g_clear_error (&monitor->last_offline_error); ++ return; ++ } + + /* save this in case the user clicks the + * 'Show Details' button from the notification below */ +-- +GitLab + diff --git a/gnome-software.changes b/gnome-software.changes index b4520bd..3b52cea 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 8 11:39:59 UTC 2022 - Dominique Leuenberger + +- Add 8cbce25.patch: Fix Gnome-Software keep poping up notification + "Software updates failed". + ------------------------------------------------------------------- Fri Mar 18 09:57:41 UTC 2022 - Bjørn Lie diff --git a/gnome-software.spec b/gnome-software.spec index 6ce9b9b..2fb01e9 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -30,6 +30,8 @@ Source0: https://download.gnome.org/sources/gnome-software/42/%{name}-%{v # PATCH-FIX-OPENSUSE gnome-software-launch-gpk-update-viewer-for-updates.patch bsc#1077332 boo#1090042 sckang@suse.com -- Don't launch gnome-software when clicking the updates notification. Launch gpk-update-viewer instead. Patch0: gnome-software-launch-gpk-update-viewer-for-updates.patch %endif +# PATCH-FIX-UPSTREAM 8cbce25.patch dimstar@opensuse.org -- Fix repeating notification "Software updates failed" +Patch1: https://gitlab.gnome.org/GNOME/gnome-software/-/commit/8cbce25.patch BuildRequires: gtk-doc BuildRequires: meson >= 0.47.0