[gnome-software] flatpak: Continue to load apps from remotes if one of them fails



commit 9ede7a2b806ec7d25c6f124bb51b328f3cda68bc
Author: Joaquim Rocha <jrocha endlessm com>
Date:   Wed May 24 20:30:28 2017 +0200

    flatpak: Continue to load apps from remotes if one of them fails
    
    If a remote is failing for some reason, it should not prevent apps from
    other remotes to be added as this can limit a lot the UX: it will
    potentially leave the user with no apps to be shown just because of one
    broken remote.

 plugins/flatpak/gs-flatpak.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index d7969c95..fe89d2b9 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -700,13 +700,16 @@ gs_flatpak_rescan_appstream_store (GsFlatpak *self,
                return FALSE;
        }
        for (guint i = 0; i < xremotes->len; i++) {
+               g_autoptr(GError) error_local = NULL;
                FlatpakRemote *xremote = g_ptr_array_index (xremotes, i);
                if (flatpak_remote_get_disabled (xremote))
                        continue;
                g_debug ("found remote %s",
                         flatpak_remote_get_name (xremote));
-               if (!gs_flatpak_add_apps_from_xremote (self, builder, xremote, cancellable, error))
-                       return FALSE;
+               if (!gs_flatpak_add_apps_from_xremote (self, builder, xremote, cancellable, &error_local)) {
+                       g_debug ("Failed to add apps from remote ā€˜%sā€™; skipping: %s",
+                                flatpak_remote_get_name (xremote), error_local->message);
+               }
        }
 
        /* add any installed files without AppStream info */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]