[gnome-software] Allow installing flatpakref files when the appstream branch is not signed
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Allow installing flatpakref files when the appstream branch is not signed
- Date: Wed, 8 Mar 2017 13:22:48 +0000 (UTC)
commit b066ca7885d23be0313fbd09a46b5e4579a5db97
Author: Richard Hughes <richard hughsie com>
Date: Wed Mar 8 13:21:07 2017 +0000
Allow installing flatpakref files when the appstream branch is not signed
Normally the appstream branch should be signed with the same key as the other
branches in the repo.
plugins/flatpak/gs-flatpak.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index eb3d0f1..96aa875 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -2957,6 +2957,7 @@ gs_flatpak_file_to_app_ref (GsFlatpak *self,
g_autofree gchar *contents = NULL;
g_autoptr(FlatpakRemoteRef) xref = NULL;
g_autoptr(GBytes) ref_file_data = NULL;
+ g_autoptr(GError) error_local = NULL;
g_autoptr(GsApp) app = NULL;
g_autoptr(FlatpakRemote) xremote = NULL;
g_autoptr(GKeyFile) kf = NULL;
@@ -3103,10 +3104,15 @@ gs_flatpak_file_to_app_ref (GsFlatpak *self,
gs_app_set_origin_hostname (app, origin_url);
gs_app_set_origin_ui (app, origin_title);
- /* get the new appstream data */
+ /* get the new appstream data (nonfatal for failure) */
if (!gs_flatpak_refresh_appstream_remote (self, remote_name,
- cancellable, error)) {
- return FALSE;
+ cancellable, &error_local)) {
+ g_autoptr(GsPluginEvent) event = gs_plugin_event_new ();
+ gs_plugin_flatpak_error_convert (&error_local);
+ gs_plugin_event_set_app (event, app);
+ gs_plugin_event_set_error (event, error_local);
+ gs_plugin_event_add_flag (event, GS_PLUGIN_EVENT_FLAG_WARNING);
+ gs_plugin_report_event (self->plugin, event);
}
/* get this now, as it's not going to be available at install time */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]