Commit 62f6314f authored by Richard Hughes's avatar Richard Hughes

trivial: Never show cancelled error messages to the user

Fixes GNOME/gnome-software#417
parent 4ffde65f
......@@ -382,8 +382,6 @@ gs_plugin_job_to_failed_event (GsPluginJob *plugin_job, const GError *error)
static gboolean
gs_plugin_loader_is_error_fatal (const GError *err)
{
if (g_error_matches (err, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_CANCELLED))
return TRUE;
if (g_error_matches (err, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_TIMED_OUT))
return TRUE;
if (g_error_matches (err, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_AUTH_REQUIRED))
......@@ -415,6 +413,12 @@ gs_plugin_error_handle_failure (GsPluginLoaderHelper *helper,
return TRUE;
}
/* this is only ever informational */
if (g_error_matches (error_local, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_CANCELLED)) {
g_debug ("ignoring error cancelled: %s", error_local->message);
return TRUE;
}
/* fatal error */
if (gs_plugin_job_get_action (helper->plugin_job) == GS_PLUGIN_ACTION_SETUP ||
gs_plugin_loader_is_error_fatal (error_local) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment