[PATCH 2/2] cli/new: add better error messages for FILE_ERROR

diff --git a/07/9f98a8f4f94cff7aad94ee8a3c87e37ac8c11e b/07/9f98a8f4f94cff7aad94ee8a3c87e37ac8c11e
new file mode 100644 (file)
index 0000000..728a50f
--- /dev/null
+++ b/07/9f98a8f4f94cff7aad94ee8a3c87e37ac8c11e
@@ -0,0 +1,72 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id A94176DE02A7\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Mar 2016 19:10:31 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.021\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.021 tagged_above=-999 required=5\r
+ tests=[AWL=-0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5qiEckSYksBG for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Mar 2016 19:10:22 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id B96EA6DE00DF\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Mar 2016 19:10:22 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1al5ay-0000A8-5w; Tue, 29 Mar 2016 22:10:56 -0400\r
+Received: (nullmailer pid 32051 invoked by uid 1000);\r
+ Wed, 30 Mar 2016 02:10:18 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] cli/new: add better error messages for FILE_ERROR\r
+Date: Tue, 29 Mar 2016 23:10:14 -0300\r
+Message-Id: <1459303814-31988-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.0.rc3\r
+In-Reply-To: <1459303814-31988-1-git-send-email-david@tethera.net>\r
+References: <1459303814-31988-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 30 Mar 2016 02:10:31 -0000\r
+\r
+The code in add_file seems to assume that NOTMUCH_STATUS_FILE_ERROR is\r
+never returned from add_message. This turns out to be false (although it\r
+seems to only happen in certain fairly rare race conditions).\r
+---\r
+ notmuch-new.c | 4 ++++\r
+ 1 file changed, 4 insertions(+)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index e503776..04cb5ca 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -281,6 +281,10 @@ add_file (notmuch_database_t *notmuch, const char *filename,\r
+       fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename);\r
+       break;\r
+     /* Fatal issues. Don't process anymore. */\r
++    case NOTMUCH_STATUS_FILE_ERROR:\r
++      fprintf (stderr, "Unexpected error with file %s\n", filename);\r
++      (void) print_status_database ("add_file", notmuch, status);\r
++      goto DONE;\r
+     case NOTMUCH_STATUS_READ_ONLY_DATABASE:\r
+     case NOTMUCH_STATUS_XAPIAN_EXCEPTION:\r
+     case NOTMUCH_STATUS_OUT_OF_MEMORY:\r
+-- \r
+2.8.0.rc3\r
+\r