service: try mkdir_with_parents() on failed writes

If we fail to write the database file, try g_mkdir_with_parents() to
create the parent directory and try again.

https://bugzilla.gnome.org/show_bug.cgi?id=689136

1 files changed, 16 insertions, 0 deletions

diff --git a/service/dconf-gvdb-utils.c b/service/dconf-gvdb-utils.c
index 9e0c4b1..a9b7ab4 100644
--- a/service/dconf-gvdb-utils.c
+++ b/service/dconf-gvdb-utils.c
@@ -160,6 +160,22 @@ dconf_gvdb_utils_write_file (const gchar     *filename,
   gvdb = gvdb_hash_table_new (NULL, NULL);
   dconf_changeset_all (database, dconf_gvdb_utils_add_key, gvdb);
   success = gvdb_table_write_contents (gvdb, filename, FALSE, error);
+
+  if (!success)
+    {
+      gchar *dirname;
+
+      /* Maybe it failed because the directory doesn't exist.  Try
+       * again, after mkdir().
+       */
+      dirname = g_path_get_dirname (filename);
+      g_mkdir_with_parents (dirname, 0777);
+      g_free (dirname);
+
+      g_clear_error (error);
+      success = gvdb_table_write_contents (gvdb, filename, FALSE, error);
+    }
+
   g_hash_table_unref (gvdb);
 
   return success;