Commit 22fd1a9e authored by Christian Hergert's avatar Christian Hergert
Browse files

flatpak-runtime-provider: be consistent with flatpak names

We want to stay consistent with flatpak and id/arch/branch.
parent fb169991
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment