[gnome-software/wip/kalev/distro-upgrade-fixes: 3/4] Include the distro version in Fedora distro upgrade app IDs

[Kalev Lember <klember src gnome org>]

commit 6eed5f1dc35c271bf3c35b7d91951e2a157aedcb
Author: Kalev Lember <klember redhat com>
Date:   Mon Oct 8 11:02:50 2018 +0200

    Include the distro version in Fedora distro upgrade app IDs
    
    If we use just "org.fedoraproject.Fedora", GsAppList deduplicates based
    on the app ID and only keeps on of the returned apps.
    
    Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1628497

 .../fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c 
b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
index 47a7ba08..1f5b129f 100644
--- a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
+++ b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2016-2017 Kalev Lember <klember redhat com>
+ * Copyright (C) 2016-2018 Kalev Lember <klember redhat com>
  * Copyright (C) 2017 Richard Hughes <richard hughsie com>
  *
  * Licensed under the GNU General Public License Version 2
@@ -275,6 +275,7 @@ static GsApp *
 _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item)
 {
        GsApp *app;
+       g_autofree gchar *app_id = NULL;
        g_autofree gchar *app_version = NULL;
        g_autofree gchar *background = NULL;
        g_autofree gchar *cache_key = NULL;
@@ -288,7 +289,7 @@ _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item)
        if (app != NULL)
                return app;
 
-       /* create app */
+       app_id = g_strdup_printf ("org.fedoraproject.Fedora-%u", item->version);
        app_version = g_strdup_printf ("%u", item->version);
 
        /* icon from disk */
@@ -297,7 +298,7 @@ _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item)
        as_icon_set_filename (ic, "/usr/share/pixmaps/fedora-logo-sprite.png");
 
        /* create */
-       app = gs_app_new ("org.fedoraproject.Fedora");
+       app = gs_app_new (app_id);
        gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
        gs_app_set_kind (app, AS_APP_KIND_OS_UPGRADE);
        gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);