[PATCH 2/2] cli/new: add better error messages for FILE_ERROR
David Bremner
david at tethera.net
Tue Mar 29 19:10:14 PDT 2016
The code in add_file seems to assume that NOTMUCH_STATUS_FILE_ERROR is
never returned from add_message. This turns out to be false (although it
seems to only happen in certain fairly rare race conditions).
---
notmuch-new.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/notmuch-new.c b/notmuch-new.c
index e503776..04cb5ca 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -281,6 +281,10 @@ add_file (notmuch_database_t *notmuch, const char *filename,
fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename);
break;
/* Fatal issues. Don't process anymore. */
+ case NOTMUCH_STATUS_FILE_ERROR:
+ fprintf (stderr, "Unexpected error with file %s\n", filename);
+ (void) print_status_database ("add_file", notmuch, status);
+ goto DONE;
case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY:
--
2.8.0.rc3
More information about the notmuch
mailing list