Skip to content
Snippets Groups Projects
Commit 43a38a21 authored by Ludovico de Nittis's avatar Ludovico de Nittis
Browse files

Merge branch 'wip/smcv/subsandbox' into 'master'

pv-wrap: Automatically copy runtime when running under Flatpak, again

See merge request !276
parents adc3e183 0f6f6844
No related branches found
No related tags found
1 merge request!276pv-wrap: Automatically copy runtime when running under Flatpak, again
Pipeline #10385 passed
...@@ -782,7 +782,7 @@ opt_copy_runtime_into_cb (const gchar *option_name, ...@@ -782,7 +782,7 @@ opt_copy_runtime_into_cb (const gchar *option_name,
{ {
if (value == NULL) if (value == NULL)
{ {
opt_copy_runtime = FALSE; /* Do nothing, keep previous setting */
} }
else if (value[0] == '\0') else if (value[0] == '\0')
{ {
...@@ -1349,13 +1349,11 @@ main (int argc, ...@@ -1349,13 +1349,11 @@ main (int argc,
original_environ = g_get_environ (); original_environ = g_get_environ ();
if (is_flatpak_env)
opt_copy_runtime = TRUE;
is_main_program = check_main_program (argc, argv); is_main_program = check_main_program (argc, argv);
/* Set defaults */ /* Set defaults */
opt_batch = pv_boolean_environment ("PRESSURE_VESSEL_BATCH", FALSE); opt_batch = pv_boolean_environment ("PRESSURE_VESSEL_BATCH", FALSE);
opt_copy_runtime = is_flatpak_env;
/* Process COPY_RUNTIME_INFO first so that COPY_RUNTIME and VARIABLE_DIR /* Process COPY_RUNTIME_INFO first so that COPY_RUNTIME and VARIABLE_DIR
* can override it */ * can override it */
opt_copy_runtime_into_cb ("$PRESSURE_VESSEL_COPY_RUNTIME_INTO", opt_copy_runtime_into_cb ("$PRESSURE_VESSEL_COPY_RUNTIME_INTO",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment