summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@gnome.org>2020-11-11 12:18:41 +0000
committerOndrej Holy <oholy@redhat.com>2020-11-19 08:12:35 +0000
commit5f07c8db552d70768a83eaa3e76fc9864b8b05db (patch)
tree953ae465b728e8c68fd823a9e6dd6d4be869acba
parentd94c25becda80c6d6b88bb84e585613439d0d317 (diff)
downloadnautilus-5f07c8db552d70768a83eaa3e76fc9864b8b05db.tar.gz
tag-manager: Search for tracker3 in PATH
Tracker 3 migration code tries to spawn tracker3 binary using G_SPAWN_SEARCH_PATH_FROM_ENVP flag. However, tracker3 is installed under /usr/local/bin/ on OpenBSD which isn't searched by envp. So the migration fails with the following warnings: "Tracker 2 migration: Couldn't run `tracker3`: Failed to execute child process "tracker3" (No such file or directory)." Let's use G_SPAWN_SEARCH_PATH instead of G_SPAWN_SEARCH_PATH_FROM_ENVP to fix this issue. (cherry picked from commit 4e43e9efcab6c3abfa24fbd6fe77d326358c1999)
-rw-r--r--src/nautilus-tag-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
index 28b96c996..24c2de616 100644
--- a/src/nautilus-tag-manager.c
+++ b/src/nautilus-tag-manager.c
@@ -972,7 +972,7 @@ export_tracker2_data (NautilusTagManager *self)
flags = G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_STDERR_TO_DEV_NULL |
- G_SPAWN_SEARCH_PATH_FROM_ENVP;
+ G_SPAWN_SEARCH_PATH;
success = g_spawn_async_with_pipes (NULL,
argv,
NULL,