summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2019-09-29 17:23:49 +0200
committerSam Thursfield <sam@afuera.me.uk>2019-09-29 17:29:44 +0200
commit23e2fbc6a53af9b36d10946a1b6c28119b681094 (patch)
tree7bc17918eaa08399fcc2e3c871cda0728f9927e3
parent07df7002f71a243b4c983d65aaa8e630cf19fa73 (diff)
downloadtracker-sam/run-uninstalled-fixes.tar.gz
Add TRACKER_MINER_SERVICES_DIR environment variablesam/run-uninstalled-fixes
This is needed to make certain Tracker commands work when running Tracker from the build tree, without installing it (as we do for the functional-tests and with the new run-uninstalled script). Without it, `tracker daemon status` and `tracker index` will look for .service files in $prefix/share/tracker/miners which may fail.
-rw-r--r--src/libtracker-control/tracker-miner-manager.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index 740eae30d..c68be8d03 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -820,9 +820,16 @@ static void
initialize_miners_data (TrackerMinerManager *manager)
{
GFile *file;
+ const gchar *miners_dir;
+
+ if (g_getenv("TRACKER_MINER_SERVICES_DIR") != NULL) {
+ miners_dir = g_getenv("TRACKER_MINER_SERVICES_DIR");
+ } else {
+ miners_dir = TRACKER_MINERS_DIR;
+ }
/* Go through service files */
- file = g_file_new_for_path (TRACKER_MINERS_DIR);
+ file = g_file_new_for_path (miners_dir);
directory_foreach (file, ".service", (GFunc) check_file, manager);
g_object_unref (file);
}