[gnome-software/wip/jrocha/fix-updates-with-broken-extensions: 2/2] flatpak: Fix aborting getting the updates when an extension is broken

[Kalev Lember <klember src gnome org>]

commit b1352421cbe8ee31d2a377371cc28abdad981c5b
Author: Joaquim Rocha <jrocha endlessm com>
Date:   Fri Mar 9 12:52:43 2018 +0100

    flatpak: Fix aborting getting the updates when an extension is broken
    
    When getting the list of updates, if a runtime extension didn't have
    its runtime installed, then it was aborting the whole operation of
    getting the list of updates.
    
    As a result, a broken runtime extension prevented all updates from
    working. Assuming that some apps use runtime extensions that are also
    compatible with other runtimes, this patch fixes the issue mentioned
    above by simply adding the extension to the list of updates. This means
    the extension will have a chance to be updated, and it will nor prevent
    other updates from being performed.

 plugins/flatpak/gs-flatpak.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index a27f8bbd..e248fe6b 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -1201,9 +1201,6 @@ get_real_app_for_update (GsFlatpak *self,
                 * not-found error, so we only report other types of errors */
                if (error_local != NULL &&
                    !g_error_matches (error_local, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
-                       g_warning ("Couldn't get the main app for related app %s: %s",
-                                  gs_app_get_unique_id (app),
-                                  error_local->message);
                        g_propagate_error (error, g_steal_pointer (&error_local));
                        gs_flatpak_error_convert (error);
                        return NULL;
@@ -1269,9 +1266,13 @@ gs_flatpak_add_updates (GsFlatpak *self, GsAppList *list,
                        continue;
                }
 
-               main_app = get_real_app_for_update (self, app, cancellable, error);
-               if (main_app == NULL)
-                       return FALSE;
+               main_app = get_real_app_for_update (self, app, cancellable, &error_local);
+               if (main_app == NULL) {
+                       g_debug ("Couldn't get the main app for updatable app extension %s: "
+                                "%s; adding the app itself to the updates list...",
+                                gs_app_get_unique_id (app), error_local->message);
+                       main_app = g_object_ref (app);
+               }
 
                gs_app_set_state (main_app, AS_APP_STATE_UPDATABLE_LIVE);
                gs_app_set_update_details (main_app, NULL);
@@ -1315,9 +1316,13 @@ gs_flatpak_add_updates_pending (GsFlatpak *self, GsAppList *list,
                        continue;
                }
 
-               main_app = get_real_app_for_update (self, app, cancellable, error);
-               if (main_app == NULL)
-                       return FALSE;
+               main_app = get_real_app_for_update (self, app, cancellable, &error_local);
+               if (main_app == NULL) {
+                       g_debug ("Couldn't get the main app for updatable app extension %s: "
+                                "%s; adding the app itself to the pending updates list...",
+                                gs_app_get_unique_id (app), error_local->message);
+                       main_app = g_object_ref (app);
+               }
 
                gs_app_set_state (main_app, AS_APP_STATE_UPDATABLE_LIVE);