[gnome-builder] flatpak: use proper SDK name when preparing build directory



commit 227e2555d7e8200af0d81615573308980f5073c0
Author: Christian Hergert <chergert redhat com>
Date:   Fri Feb 17 11:42:53 2017 -0800

    flatpak: use proper SDK name when preparing build directory
    
    This does not support a flatpak id tuple, but instead just the ref name.

 plugins/flatpak/gbp-flatpak-pipeline-addin.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-pipeline-addin.c b/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index 6654cb8..7586871 100644
--- a/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -109,12 +109,12 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
   g_autoptr(IdeSubprocessLauncher) launcher = NULL;
   g_autoptr(IdeBuildStage) stage = NULL;
   g_autofree gchar *staging_dir = NULL;
+  g_autofree gchar *sdk = NULL;
   g_autofree gchar *metadata_path = NULL;
   IdeConfiguration *config;
   IdeRuntime *runtime;
   const gchar *app_id;
   const gchar *platform;
-  const gchar *sdk;
   const gchar *branch;
   guint stage_id;
 
@@ -139,7 +139,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
   staging_dir = gbp_flatpak_get_staging_dir (config);
   app_id = ide_configuration_get_app_id (config);
   platform = gbp_flatpak_runtime_get_platform (GBP_FLATPAK_RUNTIME (runtime));
-  sdk = gbp_flatpak_runtime_get_sdk (GBP_FLATPAK_RUNTIME (runtime));
+  sdk = gbp_flatpak_runtime_get_sdk_name (GBP_FLATPAK_RUNTIME (runtime));
   branch = gbp_flatpak_runtime_get_branch (GBP_FLATPAK_RUNTIME (runtime));
 
   if (platform == NULL && sdk == NULL)
@@ -155,7 +155,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin  *self,
     platform = sdk;
 
   if (sdk == NULL)
-    sdk = platform;
+    sdk = g_strdup (platform);
 
   metadata_path = g_build_filename (staging_dir, "metadata", NULL);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]