[gnome-software/gnome-3-22] 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/gnome-3-22] Allow installing flatpakref files when the appstream branch is not signed
- Date: Wed, 8 Mar 2017 13:35:16 +0000 (UTC)
commit a1892ff01f7b39217481993372000d2c3ca60063
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.
src/plugins/gs-flatpak.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c
index a428112..361be16 100644
--- a/src/plugins/gs-flatpak.c
+++ b/src/plugins/gs-flatpak.c
@@ -2797,6 +2797,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;
@@ -2937,10 +2938,10 @@ 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_warning ("failed to pull appstream: %s", error_local->message);
}
/* 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]