Silence warnings from GLib file monitor (#1648902)

This commit is contained in:
David King 2018-11-12 12:45:54 +00:00
parent e15dc210f5
commit fbf7e5d55d
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 51198297605ec5468f587730c6a49d3be30384a0 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sun, 11 Nov 2018 16:08:20 +0100
Subject: [PATCH] libtracker-miner: Silence PREUNMOUNT/UNMOUNTED events
Those may happen in certain circumstances on monitored dirs, but are safe
to simply ignore. This leaves the warning for EVENT_MOVED which can only
be a bug in GLib since we use G_FILE_MONITOR_WATCH_MOVES.
Closes: https://gitlab.gnome.org/GNOME/tracker/issues/54
---
src/libtracker-miner/tracker-monitor.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 368467039..6bbe3b315 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -768,11 +768,12 @@ monitor_event_cb (GFileMonitor *file_monitor,
G_FILE_MONITOR_EVENT_MOVED,
is_directory, file, other_file);
break;
- case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
- case G_FILE_MONITOR_EVENT_UNMOUNTED:
case G_FILE_MONITOR_EVENT_MOVED:
g_warn_if_reached ();
break;
+ case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+ case G_FILE_MONITOR_EVENT_UNMOUNTED:
+ break;
}
g_free (file_uri);
--
2.18.1

View File

@ -4,12 +4,14 @@
Name: tracker
Version: 2.1.5
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Desktop-neutral metadata database and search tool
License: GPLv2+
URL: https://wiki.gnome.org/Projects/Tracker
Source0: https://download.gnome.org/sources/%{name}/2.1/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1648902
Patch0: tracker-2.1.5-silence-file-monitor-warnings.patch
BuildRequires: graphviz
BuildRequires: gtk-doc
@ -164,6 +166,9 @@ rm -f %{buildroot}%{_libdir}/tracker-2.0/*.so
%changelog
* Mon Nov 12 2018 David King <amigadave@amigadave.com> - 2.1.5-2
- Silence warnings from GLib file monitor (#1648902)
* Fri Sep 28 2018 Kalev Lember <klember@redhat.com> - 2.1.5-1
- Update to 2.1.5