Merge tag '0.31.4'

[notmuch] / lib / directory.cc

diff --git a/lib/directory.cc b/lib/directory.cc
index 5d13afecd73a5c9015305ee2aff1c11d004a0b6c..eee8254e7a842e18cce933907ccddeac19356474 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -261,15 +261,19 @@ notmuch_filenames_t *
 notmuch_directory_get_child_files (notmuch_directory_t *directory)
 {
     char *term;
-    notmuch_filenames_t *child_files;
+    notmuch_filenames_t *child_files = NULL;
 
     term = talloc_asprintf (directory, "%s%u:",
                            _find_prefix ("file-direntry"),
                            directory->document_id);
 
-    child_files = _create_filenames_for_terms_with_prefix (directory,
-                                                          directory->notmuch,
-                                                          term);
+    try {
+       child_files = _create_filenames_for_terms_with_prefix (directory,
+                                                              directory->notmuch,
+                                                              term);
+    } catch (Xapian::Error &error) {
+       LOG_XAPIAN_EXCEPTION (directory, error);
+    }
 
     talloc_free (term);
 
@@ -319,7 +323,7 @@ notmuch_directory_delete (notmuch_directory_t *directory)
     }
     notmuch_directory_destroy (directory);
 
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 void