Makefile: Fix to work even with GZIP environment variable set.

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 7ba06c99ae38fd7680b7fe34475d2bdbc2680541..017c47b200cb81a6cca408134752c1d5d079f2dd 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -172,7 +172,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
     unsigned int doc_id;
     char *term;
 
-    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY) {
+    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
        *status_ret = NOTMUCH_PRIVATE_STATUS_READONLY_DATABASE;
        return NULL;
     }
@@ -199,6 +199,9 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 
        doc_id = db->add_document (doc);
     } catch (const Xapian::Error &error) {
+       fprintf (stderr, "A Xapian exception occurred creating message: %s\n",
+                error.get_msg().c_str());
+       notmuch->exception_reported = TRUE;
        *status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;
        return NULL;
     }
@@ -552,7 +555,7 @@ _notmuch_message_sync (notmuch_message_t *message)
 {
     Xapian::WritableDatabase *db;
 
-    if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READONLY)
+    if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
        return;
 
     db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);