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

pressure-vessel: Stop running bwrap --help


We previously parsed this to decide whether we could use --unshare-uts,
but we stopped doing that more than a year ago, in commit 210fbd8c.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 584efdd4
No related branches found
No related tags found
1 merge request!207Refactoring from Flatpak branch
......@@ -1224,9 +1224,7 @@ main (int argc,
g_autofree gchar *cwd_l = NULL;
g_autofree gchar *cwd_p_host = NULL;
const gchar *home;
g_autofree gchar *bwrap_help = NULL;
g_autofree gchar *tools_dir = NULL;
const gchar *bwrap_help_argv[] = { "<bwrap>", "--help", NULL };
g_autoptr(PvRuntime) runtime = NULL;
g_autoptr(FILE) original_stdout = NULL;
GHashTableIter iter;
......@@ -1641,16 +1639,6 @@ main (int argc,
goto out;
}
if (!is_flatpak_env)
{
g_debug ("Checking bwrap features...");
bwrap_help_argv[0] = bwrap_executable;
bwrap_help = pv_capture_output (bwrap_help_argv, error);
if (bwrap_help == NULL)
goto out;
}
/* Start with an empty environment and populate it later */
bwrap = flatpak_bwrap_new (flatpak_bwrap_empty_env);
flatpak_bwrap_add_arg (bwrap, bwrap_executable);
......
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