db4ed3
From 6a6797446f13378035a2700253546b524d629c8a Mon Sep 17 00:00:00 2001
db4ed3
From: Marek Kasik <mkasik@redhat.com>
db4ed3
Date: Tue, 10 Jul 2018 18:29:16 +0200
db4ed3
Subject: [PATCH] Check mtimes of files when updating databases
db4ed3
db4ed3
Do not check just mtimes of directories in /etc/dconf/db/
db4ed3
but also mtimes of the files in those directories
db4ed3
to catch all modifications in them.
db4ed3
db4ed3
https://bugzilla.gnome.org/show_bug.cgi?id=708258
db4ed3
---
db4ed3
 bin/dconf-update.vala | 41 ++++++++++++++++++++++++++++++++++-------
db4ed3
 1 file changed, 34 insertions(+), 7 deletions(-)
db4ed3
db4ed3
diff --git a/bin/dconf-update.vala b/bin/dconf-update.vala
db4ed3
index d452092..5aac6c7 100644
db4ed3
--- a/bin/dconf-update.vala
db4ed3
+++ b/bin/dconf-update.vala
db4ed3
@@ -162,21 +162,48 @@ Gvdb.HashTable read_directory (string dirname) throws GLib.Error {
db4ed3
 	return table;
db4ed3
 }
db4ed3
 
db4ed3
+time_t get_directory_mtime (string dirname, Posix.Stat dir_buf) throws GLib.Error {
db4ed3
+	Posix.Stat lockdir_buf;
db4ed3
+	Posix.Stat file_buf;
db4ed3
+	time_t dir_mtime = dir_buf.st_mtime;
db4ed3
+
db4ed3
+	var files = list_directory (dirname, Posix.S_IFREG);
db4ed3
+	files.sort (strcmp);
db4ed3
+	files.reverse ();
db4ed3
+
db4ed3
+	foreach (var filename in files) {
db4ed3
+		if (Posix.stat (filename, out file_buf) == 0 && file_buf.st_mtime > dir_mtime)
db4ed3
+			dir_mtime = file_buf.st_mtime;
db4ed3
+	}
db4ed3
+
db4ed3
+	if (Posix.stat (dirname + "/locks", out lockdir_buf) == 0 && Posix.S_ISDIR (lockdir_buf.st_mode)) {
db4ed3
+		if (lockdir_buf.st_mtime > dir_mtime) {
db4ed3
+			// if the lock directory has been updated more recently then consider its timestamp instead
db4ed3
+			dir_mtime = lockdir_buf.st_mtime;
db4ed3
+		}
db4ed3
+
db4ed3
+		files = list_directory (dirname + "/locks", Posix.S_IFREG);
db4ed3
+		files.sort (strcmp);
db4ed3
+		files.reverse ();
db4ed3
+
db4ed3
+		foreach (var filename in files) {
db4ed3
+			if (Posix.stat (filename, out file_buf) == 0 && file_buf.st_mtime > dir_mtime)
db4ed3
+				dir_mtime = file_buf.st_mtime;
db4ed3
+		}
db4ed3
+	}
db4ed3
+
db4ed3
+	return dir_mtime;
db4ed3
+}
db4ed3
+
db4ed3
 void maybe_update_from_directory (string dirname) throws GLib.Error {
db4ed3
 	Posix.Stat dir_buf;
db4ed3
 
db4ed3
 	if (Posix.stat (dirname, out dir_buf) == 0 && Posix.S_ISDIR (dir_buf.st_mode)) {
db4ed3
-		Posix.Stat lockdir_buf;
db4ed3
 		Posix.Stat file_buf;
db4ed3
 
db4ed3
 		var filename = dirname.substring (0, dirname.length - 2);
db4ed3
 
db4ed3
-		if (Posix.stat (dirname + "/locks", out lockdir_buf) == 0 && lockdir_buf.st_mtime > dir_buf.st_mtime) {
db4ed3
-			// if the lock directory has been updated more recently then consider its timestamp instead
db4ed3
-			dir_buf.st_mtime = lockdir_buf.st_mtime;
db4ed3
-		}
db4ed3
-
db4ed3
-		if (Posix.stat (filename, out file_buf) == 0 && file_buf.st_mtime > dir_buf.st_mtime) {
db4ed3
+		if (Posix.stat (filename, out file_buf) == 0 && file_buf.st_mtime > get_directory_mtime (dirname, dir_buf)) {
db4ed3
 			return;
db4ed3
 		}
db4ed3
 
db4ed3
-- 
db4ed3
2.17.1
db4ed3