[gnome-software/gnome-3-22] Load user and system merge components into the flatpak stores

[Kalev Lember <klember src gnome org>]

commit 586a4ceec256d3e9cdf18ae68b01c89ef3713d9d
Author: Richard Hughes <richard hughsie com>
Date:   Wed Oct 12 10:17:43 2016 +0100

    Load user and system merge components into the flatpak stores
    
    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=772524
    (cherry picked from commit f4e7997118a001aab352d7c91697a57d4e5e1804)

 src/plugins/gs-flatpak.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c
index 1bad0b1..de8c379 100644
--- a/src/plugins/gs-flatpak.c
+++ b/src/plugins/gs-flatpak.c
@@ -335,6 +335,16 @@ gs_flatpak_setup (GsFlatpak *self, GCancellable *cancellable, GError **error)
        const gchar *destdir;
        g_autoptr(AsProfileTask) ptask = NULL;
 
+       /* load just the wildcards */
+       if (!as_store_load (self->store,
+                           AS_STORE_LOAD_FLAG_ONLY_MERGE_APPS |
+                           AS_STORE_LOAD_FLAG_ONLY_UNCOMPRESSED |
+                           AS_STORE_LOAD_FLAG_APP_INFO_USER |
+                           AS_STORE_LOAD_FLAG_APP_INFO_SYSTEM,
+                           cancellable, error)) {
+               return FALSE;
+       }
+
        /* we use a permissions helper to elevate privs */
        ptask = as_profile_start_literal (gs_plugin_get_profile (self->plugin),
                                          "flatpak::ensure-origin");