[gnome-builder/wip/chergert/pipeline-merge] flatpak-runtime-provider: be consistent with flatpak names

[Christian Hergert <chergert src gnome org>]

commit 22fd1a9ef565a30d2ce8262c94437fbf5d0e827b
Author: Christian Hergert <chergert redhat com>
Date:   Fri Feb 10 21:24:04 2017 -0800

    flatpak-runtime-provider: be consistent with flatpak names
    
    We want to stay consistent with flatpak and id/arch/branch.

 .../flatpak/gbp-flatpak-configuration-provider.c   |    2 +-
 plugins/flatpak/gbp-flatpak-runtime-provider.c     |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-configuration-provider.c 
b/plugins/flatpak/gbp-flatpak-configuration-provider.c
index 15ff940..aabbb4b 100644
--- a/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -830,7 +830,7 @@ check_dir_for_manifests (GFile         *directory,
       manifest->branch = g_strdup (branch);
 
       arch = flatpak_get_default_arch ();
-      manifest->runtime_id = g_strdup_printf ("flatpak:%s/%s/%s", platform, branch, arch);
+      manifest->runtime_id = g_strdup_printf ("flatpak:%s/%s/%s", platform, arch, branch);
 
       manifest->sdk = json_node_dup_string (sdk_node);
 
diff --git a/plugins/flatpak/gbp-flatpak-runtime-provider.c b/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 3424f09..a98ab52 100644
--- a/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -132,7 +132,7 @@ gbp_flatpak_runtime_provider_load_refs (GbpFlatpakRuntimeProvider  *self,
       arch = flatpak_ref_get_arch (FLATPAK_REF (ref));
       branch = flatpak_ref_get_branch (FLATPAK_REF (ref));
 
-      id = g_strdup_printf ("flatpak:%s/%s/%s", name, branch, arch);
+      id = g_strdup_printf ("flatpak:%s/%s/%s", name, arch, branch);
 
       if (contains_id (runtimes, id))
         continue;
@@ -462,6 +462,8 @@ gbp_flatpak_runtime_provider_install_async (IdeRuntimeProvider  *provider,
   task = g_task_new (self, cancellable, callback, user_data);
   g_task_set_source_tag (task, gbp_flatpak_runtime_provider_install_async);
 
+  /* flatpak:name/arch/branch */
+
   if (!g_str_has_prefix (runtime_id, "flatpak:"))
     IDE_GOTO (unknown_runtime_id);