--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1263D431FC2\r
+ for <notmuch@notmuchmail.org>; Sun, 23 Nov 2014 03:15:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 4untd6rGMfhi for <notmuch@notmuchmail.org>;\r
+ Sun, 23 Nov 2014 03:15:19 -0800 (PST)\r
+Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com\r
+ [209.85.212.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 07A8C431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 23 Nov 2014 03:15:19 -0800 (PST)\r
+Received: by mail-wi0-f172.google.com with SMTP id n3so3090444wiv.17\r
+ for <notmuch@notmuchmail.org>; Sun, 23 Nov 2014 03:15:18 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+ bh=+clLSqP6UFD8Fm4ZmdLFUrDNhCLc+ZChqX2iIYq4TOY=;\r
+ b=kH/gT1X8v8mZChzFcnw7Yayy7pVr+uikStxMbRzyVEprrf7ig6578OZEbzVPArVENW\r
+ azdoEF6Z/hNlrmS5Rz1SWQ0tx9FNX2Dw1Yh2CdqXYM95lh0HPobdRXs5mB6MzoF+J37m\r
+ p2YjyDfzFdPrezeHzRVf0/G/im69tMxfEM6v9ZX17op6NyVKvBLG5E9PevtK3QTQLqA/\r
+ 3clTyqEkW+KyXjfVm1922Cd32HVfJMmcgEV1q0O4TMwVFkI/arKSZWh/UUNT8iiaT1lh\r
+ DL+n2stVjPCFKXhCgNzkmSlULnOWRLpS2DwSqg7rfY0pusz2SIWCEquX+KideBXVHZ4H\r
+ 1s2A==\r
+X-Gm-Message-State:\r
+ ALoCoQn26z281h8Nd8fRXMOdUMH5fyJAjPDdxwTb0xzGKONxPFIGKcjqDIT2Shvw2x8iW4g9NP3O\r
+X-Received: by 10.180.92.234 with SMTP id cp10mr12734733wib.16.1416741317798; \r
+ Sun, 23 Nov 2014 03:15:17 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c362-144.dhcp.inet.fi.\r
+ [88.195.98.144])\r
+ by mx.google.com with ESMTPSA id pl6sm6928995wic.22.2014.11.23.03.15.16\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 23 Nov 2014 03:15:17 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: drop the deprecation message for single-message mbox\r
+ files\r
+Date: Sun, 23 Nov 2014 13:15:12 +0200\r
+Message-Id: <1416741312-26332-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 23 Nov 2014 11:15:23 -0000\r
+\r
+We generally do not support mbox files, but for historical reasons\r
+we've supported single-message mbox files, with a deprecation\r
+message. We've tried dropping the support altogether, but backed out\r
+of it because we'd need to stop indexing them, while keeping support\r
+for previously indexed files. This would be more complicated than\r
+simply supporting single-message mbox files. Therefore, drop the\r
+deprecation message, and just silently accept single-message mboxes.\r
+---\r
+ lib/message-file.c | 21 ++++-----------------\r
+ test/T050-new.sh | 6 +-----\r
+ 2 files changed, 5 insertions(+), 22 deletions(-)\r
+\r
+diff --git a/lib/message-file.c b/lib/message-file.c\r
+index eda1b748e202..a41d9ad2a719 100644\r
+--- a/lib/message-file.c\r
++++ b/lib/message-file.c\r
+@@ -170,25 +170,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)\r
+ goto DONE;\r
+ }\r
+ \r
+- if (is_mbox) {\r
+- if (! g_mime_parser_eos (parser)) {\r
+- /* This is a multi-message mbox. */\r
+- status = NOTMUCH_STATUS_FILE_NOT_EMAIL;\r
+- goto DONE;\r
+- }\r
++ if (is_mbox && ! g_mime_parser_eos (parser)) {\r
+ /*\r
+- * For historical reasons, we support single-message mboxes,\r
+- * but this behavior is likely to change in the future, so\r
+- * warn.\r
++ * This is a multi-message mbox. (For historical reasons, we\r
++ * do support single-message mboxes.)\r
+ */\r
+- static notmuch_bool_t mbox_warning = FALSE;\r
+- if (! mbox_warning) {\r
+- mbox_warning = TRUE;\r
+- fprintf (stderr, "\\r
+-Warning: %s is an mbox containing a single message,\n\\r
+-likely caused by misconfigured mail delivery. Support for single-message\n\\r
+-mboxes is deprecated and may be removed in the future.\n", message->filename);\r
+- }\r
++ status = NOTMUCH_STATUS_FILE_NOT_EMAIL;\r
+ }\r
+ \r
+ DONE:\r
+diff --git a/test/T050-new.sh b/test/T050-new.sh\r
+index ad46ee6d51b6..7119356fc9fe 100755\r
+--- a/test/T050-new.sh\r
++++ b/test/T050-new.sh\r
+@@ -173,11 +173,7 @@ Subject: Test mbox message 1\r
+ Body.\r
+ EOF\r
+ output=$(NOTMUCH_NEW 2>&1)\r
+-test_expect_equal "$output" \\r
+-"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message,\r
+-likely caused by misconfigured mail delivery. Support for single-message\r
+-mboxes is deprecated and may be removed in the future.\r
+-Added 1 new message to the database."\r
++test_expect_equal "$output" "Added 1 new message to the database."\r
+ \r
+ # This test requires that notmuch new has been run at least once.\r
+ test_begin_subtest "Skip and report non-mail files"\r
+-- \r
+2.1.3\r
+\r
projects / notmuch-archives.git / commitdiff