Skip to content
Snippets Groups Projects
Commit 342c597a authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/t23422' into 'master'

wrap: Don't populate environment of FlatpakBwrap that will be merged

See merge request steam/pressure-vessel!74
parents bb55eddd 07f02a83
No related branches found
No related tags found
No related merge requests found
...@@ -429,7 +429,7 @@ pv_bwrap_copy (FlatpakBwrap *bwrap) ...@@ -429,7 +429,7 @@ pv_bwrap_copy (FlatpakBwrap *bwrap)
* flatpak_bwrap_append_bwrap() would steal them. */ * flatpak_bwrap_append_bwrap() would steal them. */
g_return_val_if_fail (bwrap->fds == NULL || bwrap->fds->len == 0, NULL); g_return_val_if_fail (bwrap->fds == NULL || bwrap->fds->len == 0, NULL);
ret = flatpak_bwrap_new (NULL); ret = flatpak_bwrap_new (flatpak_bwrap_empty_env);
flatpak_bwrap_append_bwrap (ret, bwrap); flatpak_bwrap_append_bwrap (ret, bwrap);
return ret; return ret;
} }
...@@ -1074,7 +1074,7 @@ main (int argc, ...@@ -1074,7 +1074,7 @@ main (int argc,
g_debug ("Found executable directory: %s", tools_dir); g_debug ("Found executable directory: %s", tools_dir);
wrapped_command = flatpak_bwrap_new (NULL); wrapped_command = flatpak_bwrap_new (flatpak_bwrap_empty_env);
switch (opt_terminal) switch (opt_terminal)
{ {
...@@ -1447,7 +1447,7 @@ main (int argc, ...@@ -1447,7 +1447,7 @@ main (int argc,
if (!flatpak_bwrap_bundle_args (bwrap, 1, -1, FALSE, error)) if (!flatpak_bwrap_bundle_args (bwrap, 1, -1, FALSE, error))
goto out; goto out;
adverb_args = flatpak_bwrap_new (NULL); adverb_args = flatpak_bwrap_new (flatpak_bwrap_empty_env);
if (runtime != NULL) if (runtime != NULL)
adverb_in_container = pv_runtime_get_adverb (runtime, adverb_args); adverb_in_container = pv_runtime_get_adverb (runtime, adverb_args);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment