diff --git a/builder/builder-git.c b/builder/builder-git.c index a440cfe95..049d5cc6c 100644 --- a/builder/builder-git.c +++ b/builder/builder-git.c @@ -304,7 +304,7 @@ builder_git_mirror_repo (const char *repo_location, g_ptr_array_add (args, filename_tmp); g_ptr_array_add (args, NULL); - res = flatpak_spawnv (parent, NULL, error, + res = flatpak_spawnv (parent, NULL, 0, error, (const gchar * const *) args->pdata); if (cached_git_dir && !update && diff --git a/builder/builder-source-archive.c b/builder/builder-source-archive.c index ff9452b4e..c6a8099b8 100644 --- a/builder/builder-source-archive.c +++ b/builder/builder-source-archive.c @@ -383,7 +383,7 @@ unrpm (GFile *dir, rpm_path, /* shell's $1 */ NULL }; - res = flatpak_spawnv (dir, NULL, error, argv); + res = flatpak_spawnv (dir, NULL, 0, error, argv); return res; } diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c index 368ceb8dc..ff35a2ffc 100644 --- a/builder/builder-source-patch.c +++ b/builder/builder-source-patch.c @@ -222,7 +222,7 @@ patch (GFile *dir, } g_ptr_array_add (args, NULL); - res = flatpak_spawnv (dir, NULL, error, (const char **) args->pdata); + res = flatpak_spawnv (dir, NULL, 0, error, (const char **) args->pdata); g_ptr_array_free (args, TRUE); diff --git a/builder/builder-utils.c b/builder/builder-utils.c index bbc43d378..388de9bc6 100644 --- a/builder/builder-utils.c +++ b/builder/builder-utils.c @@ -1597,7 +1597,7 @@ builder_maybe_host_spawnv (GFile *dir, if (flatpak_is_in_sandbox ()) return builder_host_spawnv (dir, output, error, argv); - return flatpak_spawnv (dir, output, error, argv); + return flatpak_spawnv (dir, output, 0, error, argv); } typedef struct { diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index 255097654..f6b9b40bd 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -1956,7 +1956,7 @@ flatpak_spawn (GFile *dir, g_ptr_array_add (args, (gchar *) arg); g_ptr_array_add (args, NULL); - res = flatpak_spawnv (dir, output, error, (const gchar * const *) args->pdata); + res = flatpak_spawnv (dir, output, 0, error, (const gchar * const *) args->pdata); g_ptr_array_free (args, TRUE); @@ -1966,6 +1966,7 @@ flatpak_spawn (GFile *dir, gboolean flatpak_spawnv (GFile *dir, char **output, + GSubprocessFlags flags, GError **error, const gchar * const *argv) { @@ -1980,7 +1981,9 @@ flatpak_spawnv (GFile *dir, launcher = g_subprocess_launcher_new (0); if (output) - g_subprocess_launcher_set_flags (launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE); + flags |= G_SUBPROCESS_FLAGS_STDOUT_PIPE; + + g_subprocess_launcher_set_flags (launcher, flags); if (dir) { diff --git a/common/flatpak-utils.h b/common/flatpak-utils.h index e18b33651..829c90349 100644 --- a/common/flatpak-utils.h +++ b/common/flatpak-utils.h @@ -405,6 +405,7 @@ gboolean flatpak_spawn (GFile *dir, gboolean flatpak_spawnv (GFile *dir, char **output, + GSubprocessFlags flags, GError **error, const gchar * const *argv);