cli/crypto: treat failure to create a crypto context as fatal.

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index e7965ceab1c55fb9347b6657df45fa62330b4839..5cc3b2f62b46530e5dbb3f63b5d127043fc9c610 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int include)
        sep = ",";
     }
     if (include & DUMP_INCLUDE_TAGS) {
-       gzprintf (output, "%sproperties", sep);
+       gzprintf (output, "%stags", sep);
     }
     gzputs (output, "\n");
 }
@@ -240,7 +240,7 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
      */
     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
 
-    status = notmuch_query_search_messages_st (query, &messages);
+    status = notmuch_query_search_messages (query, &messages);
     if (print_status_query ("notmuch dump", query, status))
        return EXIT_FAILURE;
 
@@ -250,7 +250,8 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
 
        message = notmuch_messages_get (messages);
 
-       if (dump_tags_message (notmuch, message, output_format, output,
+       if ((include & DUMP_INCLUDE_TAGS) &&
+           dump_tags_message (notmuch, message, output_format, output,
                               &buffer, &buffer_size))
            return EXIT_FAILURE;