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

pressure-vessel: Fix sense of assertion, and realign with other checks


This function won't work in Flatpak, so we make sure that we only call
it when we are *not* in Flatpak. The assertion should match that.

This fixes the ability to run:

    ./pressure-vessel/bin/pressure-vessel-wrap -- xterm

when not in a Flatpak environment, which in principle is meant to work
(at least on reasonably normal FHS operating systems), although it isn't
regularly tested.

Thanks to NixOS contributor moben on Github, who spotted this while
debugging.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 07514b25
No related branches found
No related tags found
1 merge request!177Fix and test launching without --runtime
......@@ -331,7 +331,7 @@ export_contents_of_run (FlatpakBwrap *bwrap,
g_return_val_if_fail (bwrap != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS),
g_return_val_if_fail (!g_file_test ("/.flatpak-info", G_FILE_TEST_IS_REGULAR),
FALSE);
dir = g_dir_open ("/run", 0, error);
......
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