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

Merge branch 'wip/runtime_search_program' into 'master'

runtime: When in a Flatpak env try to get the right executables

See merge request !288
parents 79407cf2 f77ef88a
No related branches found
No related tags found
1 merge request!288runtime: When in a Flatpak env try to get the right executables
Pipeline #11471 passed
......@@ -3065,7 +3065,7 @@ pv_runtime_search_in_path_and_bin (PvRuntime *self,
NULL
};
if (g_strcmp0 (self->host_in_current_namespace, "/") == 0)
if (g_strcmp0 (self->provider_in_current_namespace, "/") == 0)
{
gchar *found_path = g_find_program_in_path (program_name);
if (found_path != NULL)
......@@ -3077,7 +3077,7 @@ pv_runtime_search_in_path_and_bin (PvRuntime *self,
g_autofree gchar *test_path = g_build_filename (common_bin_dirs[i],
program_name,
NULL);
if (_srt_file_test_in_sysroot (self->host_in_current_namespace, -1,
if (_srt_file_test_in_sysroot (self->provider_in_current_namespace, -1,
test_path, G_FILE_TEST_IS_EXECUTABLE))
return g_steal_pointer (&test_path);
}
......
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