diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2018-07-26 13:22:14 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-07-26 13:22:14 +0200 |
| commit | 10542e0868a1137ae254d58a11f8f082431c4099 (patch) | |
| tree | ef2b524654b2e2de4cda7b440cc1c6ee9945b649 | |
| parent | f2606b4fe89ca2f2874f1508d554c850449633c7 (diff) | |
| parent | 592b717654313aa2d2c90355883a1a0f2147139d (diff) | |
| download | tracker-10542e0868a1137ae254d58a11f8f082431c4099.tar.gz | |
Merge branch 'wip/carlosg/fix-bijiben-flatpak'
| -rw-r--r-- | src/libtracker-data/tracker-db-manager.c | 1 | ||||
| -rw-r--r-- | src/libtracker-direct/tracker-direct.c | 12 | ||||
| -rw-r--r-- | src/libtracker-sparql-backend/tracker-backend.vala | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c index 5e5b7299c..9744481f8 100644 --- a/src/libtracker-data/tracker-db-manager.c +++ b/src/libtracker-data/tracker-db-manager.c @@ -654,7 +654,6 @@ tracker_db_manager_new (TrackerDBManagerFlags flags, * reindex) if reindexing is already needed. */ if (!need_reindex && - (flags & TRACKER_DB_MANAGER_READONLY) == 0 && !g_file_test (db_manager->db.abs_filename, G_FILE_TEST_EXISTS)) { if ((flags & TRACKER_DB_MANAGER_READONLY) == 0) { g_info ("Could not find database file:'%s', reindex will be forced", db_manager->db.abs_filename); diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-direct/tracker-direct.c index 4b8d74a73..768b7c7c8 100644 --- a/src/libtracker-direct/tracker-direct.c +++ b/src/libtracker-direct/tracker-direct.c @@ -295,12 +295,16 @@ tracker_direct_connection_initable_init (GInitable *initable, priv->data_manager = tracker_data_manager_new (db_flags | default_flags, priv->store, priv->journal, priv->ontology, FALSE, FALSE, 100, 100); - if (!g_initable_init (G_INITABLE (priv->data_manager), cancellable, error)) + if (!g_initable_init (G_INITABLE (priv->data_manager), cancellable, error)) { + g_clear_object (&priv->data_manager); return FALSE; + } - /* Set up WAL hook on our connection */ - iface = tracker_data_manager_get_writable_db_interface (priv->data_manager); - tracker_db_interface_sqlite_wal_hook (iface, wal_hook); + if ((priv->flags & TRACKER_SPARQL_CONNECTION_FLAGS_READONLY) == 0) { + /* Set up WAL hook on our connection */ + iface = tracker_data_manager_get_writable_db_interface (priv->data_manager); + tracker_db_interface_sqlite_wal_hook (iface, wal_hook); + } /* Initialize namespace manager */ priv->namespace_manager = tracker_namespace_manager_new (); diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql-backend/tracker-backend.vala index 490884031..cc6d23c43 100644 --- a/src/libtracker-sparql-backend/tracker-backend.vala +++ b/src/libtracker-sparql-backend/tracker-backend.vala @@ -196,7 +196,7 @@ class Tracker.Sparql.Backend : Connection { try { direct = create_readonly_direct (); - } catch (Error e) { + } catch (GLib.Error e) { warning ("Falling back to bus backend, the direct backend failed to initialize: " + e.message); } |