diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2018-07-02 18:27:19 +0200 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2018-07-02 18:27:19 +0200 |
commit | ee07c990a6c3835ee90a7b5c5c1c630a8b228e4c (patch) | |
tree | 299195a6d60c5557c9dde552660cc6451bca2130 /src/libtracker-common | |
parent | c8737630f484291fbb602fba11dd1daa72e5c80c (diff) | |
download | tracker-ee07c990a6c3835ee90a7b5c5c1c630a8b228e4c.tar.gz |
libtracker-miners-common: Improve error when domain rule isn't found
Before:
GLib-CRITICAL **: g_key_file_load_from_file: assertion 'file != NULL' failed
CRITICAL **: Could not load domain ontology '(null)': Key file does not have group “DomainOntology”
After:
ERROR **: Unable to find default domain ontology rule /usr/local/share/tracker/domain-ontologies/default.rule
Diffstat (limited to 'src/libtracker-common')
-rw-r--r-- | src/libtracker-common/tracker-domain-ontology.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libtracker-common/tracker-domain-ontology.c b/src/libtracker-common/tracker-domain-ontology.c index 248cd7b50..cd104a1cb 100644 --- a/src/libtracker-common/tracker-domain-ontology.c +++ b/src/libtracker-common/tracker-domain-ontology.c @@ -297,7 +297,7 @@ tracker_domain_ontology_initable_init (GInitable *initable, TrackerDomainOntologyPrivate *priv; GError *inner_error = NULL; GKeyFile *key_file = NULL; - gchar *path; + gchar *path, *path_for_tests; domain_ontology = TRACKER_DOMAIN_ONTOLOGY (initable); priv = tracker_domain_ontology_get_instance_private (domain_ontology); @@ -318,8 +318,14 @@ tracker_domain_ontology_initable_init (GInitable *initable, if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { /* This is only for uninstalled tests */ + path_for_tests = g_strdup (g_getenv ("TRACKER_TEST_DOMAIN_ONTOLOGY_RULE")); + + if (path_for_tests == NULL) { + g_error ("Unable to find default domain ontology rule %s", path); + } + g_free (path); - path = g_strdup (g_getenv ("TRACKER_TEST_DOMAIN_ONTOLOGY_RULE")); + path = path_for_tests; } } |