[gnome-builder/gnome-builder-3-24] flatpak: Don't pass flatak-build unknown options

[Matthew Leeds <mwleeds src gnome org>]

commit 05a3959e336baf8c51bbd89e651127cc51c4319d
Author: Matthew Leeds <mleeds redhat com>
Date:   Mon Mar 27 15:39:01 2017 -0500

    flatpak: Don't pass flatak-build unknown options
    
    There are some options "flatpak build-finish" accepts that aren't
    accepted by "flatpak build", so don't pass those along. This is consistent
    with the behavior of flatpak-builder itself, with the exception of the
    --filesystem option that we leave alone.

 plugins/flatpak/gbp-flatpak-runner.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runner.c b/plugins/flatpak/gbp-flatpak-runner.c
index 4a8ced8..413a5cf 100644
--- a/plugins/flatpak/gbp-flatpak-runner.c
+++ b/plugins/flatpak/gbp-flatpak-runner.c
@@ -71,8 +71,12 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner             *runner,
         {
           const gchar *arg = finish_args[j];
 
-          /* "flatpak build" does not support require-version */
-          if (!g_str_has_prefix (arg, "--require-version"))
+          /* "flatpak build" does not support all build-finish args */
+          if (!g_str_has_prefix (arg, "--require-version") &&
+              !g_str_has_prefix (arg, "--extension") &&
+              !g_str_has_prefix (arg, "--runtime") &&
+              !g_str_has_prefix (arg, "--sdk") &&
+              !g_str_has_prefix (arg, "--command"))
             ide_subprocess_launcher_insert_argv (launcher, i++, arg);
         }
     }