From: David Bremner <david@tethera.net>
Date: Sat, 15 Jul 2017 02:01:26 +0000 (-0300)
Subject: cli/new: improve error reporting
X-Git-Tag: 0.26_rc0~205
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1307868f1e885fe5791a7c63ba33329eef405a80

cli/new: improve error reporting

Recently a user reported a crash in notmuch new, but because of
missing error reporting, all they could say was "A Xapian exception
occured". This commit adds the extra information available about
the error message in the exception.
---

diff --git a/notmuch-new.c b/notmuch-new.c
index 3a60f7ca..16b4d022 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -291,8 +291,7 @@ add_file (notmuch_database_t *notmuch, const char *filename,
     case NOTMUCH_STATUS_READ_ONLY_DATABASE:
     case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
     case NOTMUCH_STATUS_OUT_OF_MEMORY:
-	fprintf (stderr, "Error: %s. Halting processing.\n",
-		 notmuch_status_to_string (status));
+	(void) print_status_database("add_file", notmuch, status);
 	goto DONE;
     default:
 	INTERNAL_ERROR ("add_message returned unexpected value: %d", status);