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

builder: Pass --die-with-parent to all flatpak build commands 

This is not done by default anymore, as per
 75d7e76276
tingping/wmclass
Alexander Larsson 2017-08-30 11:20:46 +02:00
parent 4ff21f43ad
commit 5068a700d0
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/builder-manifest.c
View File

@ -1802,6 +1802,7 @@ command (GFile *app_dir,
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--die-with-parent"));
g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
if (extra_args)
{
@ -1981,6 +1982,7 @@ appstream_compose (GFile *app_dir,
args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--die-with-parent"));
g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
g_ptr_array_add (args, g_file_get_path (app_dir));
g_ptr_array_add (args, g_strdup ("appstream-compose"));
@ -3244,6 +3246,7 @@ builder_manifest_run (BuilderManifest *self,
args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--die-with-parent"));
build_dir_path = g_file_get_path (builder_context_get_build_dir (context));
g_ptr_array_add (args, g_strdup_printf ("--bind-mount=/run/%s=%s",

1
src/builder-module.c
View File

@ -1010,6 +1010,7 @@ setup_build_args (GFile *app_dir,
args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--die-with-parent"));
source_dir_path_canonical = realpath (source_dir_path, NULL);
if (source_dir_path_canonical == NULL)

1
src/builder-source-shell.c
View File

@ -129,6 +129,7 @@ run_script (BuilderContext *context,
args = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
g_ptr_array_add (args, g_strdup ("--die-with-parent"));
source_dir_path_canonical = realpath (source_dir_path, NULL);