[gnome-builder] flatpak: don't pass --require-version to flatpak build
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] flatpak: don't pass --require-version to flatpak build
- Date: Mon, 13 Mar 2017 05:15:09 +0000 (UTC)
commit c35b54b9a0fc3dd8dde01eec0f7df9b8d9664c47
Author: Christian Hergert <chergert redhat com>
Date: Sun Mar 12 22:14:57 2017 -0700
flatpak: don't pass --require-version to flatpak build
When running the application inside of "flatpak build", we don't want to
pass --require-version because that is only supported for the build-finish
operation.
plugins/flatpak/gbp-flatpak-runner.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runner.c b/plugins/flatpak/gbp-flatpak-runner.c
index 2f3d52d..4a8ced8 100644
--- a/plugins/flatpak/gbp-flatpak-runner.c
+++ b/plugins/flatpak/gbp-flatpak-runner.c
@@ -65,10 +65,16 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner *runner,
if (GBP_IS_FLATPAK_CONFIGURATION (configuration))
{
- const gchar * const *finish_args = NULL;
- finish_args = gbp_flatpak_configuration_get_finish_args (GBP_FLATPAK_CONFIGURATION (configuration));
+ const gchar * const *finish_args = gbp_flatpak_configuration_get_finish_args
(GBP_FLATPAK_CONFIGURATION (configuration));
+
for (guint j = 0; finish_args[j]; j++)
- ide_subprocess_launcher_insert_argv (launcher, i++, finish_args[j]);
+ {
+ const gchar *arg = finish_args[j];
+
+ /* "flatpak build" does not support require-version */
+ if (!g_str_has_prefix (arg, "--require-version"))
+ ide_subprocess_launcher_insert_argv (launcher, i++, arg);
+ }
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]