From 1a9cbafecbe1da4d1f6ffe6ce6d343eff139c8cf Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 23 Nov 2020 18:13:44 +0000 Subject: [PATCH] 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: Simon McVittie <smcv@collabora.com> --- pressure-vessel/wrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c index 961d29dbb..9e151bcd9 100644 --- a/pressure-vessel/wrap.c +++ b/pressure-vessel/wrap.c @@ -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); -- GitLab