marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix handling of sdk default compiler options 

It turns out that newer flatpaks changed the output of flatpak info
and we relied on parsing that due to the lack of --show-location option
to flatpak info. However, that has been added since flatpak 0.11.8, so
just use that instead of parsing it.

Closes: #270
Approved by: alexlarsson
auto
Alexander Larsson 2019-02-08 11:15:54 +01:00 committed by Atomic Bot
parent 8839ff08b1
commit c7f8a50f7b
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/builder-manifest.c
View File

@ -1558,27 +1558,17 @@ flatpak_info_show_path (const char *id,
const char *branch,
BuilderContext *context)
{
g_autofree char *sdk_info = NULL;
g_autofree char *output = NULL;
g_autofree char *arch_option = NULL;
g_auto(GStrv) sdk_info_lines = NULL;
int i;
/* Unfortunately there is not flatpak info --show-path, so we have to look at the full flatpak info output */
arch_option = g_strdup_printf ("--arch=%s", builder_context_get_arch (context));
sdk_info = flatpak (NULL, "info", arch_option, id, branch, NULL);
if (sdk_info == NULL)
output = flatpak (NULL, "info", "--show-location", arch_option, id, branch, NULL);
if (output == NULL)
return NULL;
sdk_info_lines = g_strsplit (sdk_info, "\n", -1);
for (i = 0; sdk_info_lines[i] != NULL; i++)
{
if (g_str_has_prefix (sdk_info_lines[i], "Location:"))
return g_strstrip (g_strdup (sdk_info_lines[i] + strlen ("Location:")));
}
return NULL;
g_strchomp (output);
return g_steal_pointer (&output);
}
gboolean