[PATCH 2/2] notmuch-restore: fix error message for extra positional parameter.

diff --git a/67/0a46117a1b0e7abdb07d4673a4d272382bdb34 b/67/0a46117a1b0e7abdb07d4673a4d272382bdb34
new file mode 100644 (file)
index 0000000..bfc4d37
--- /dev/null
+++ b/67/0a46117a1b0e7abdb07d4673a4d272382bdb34
@@ -0,0 +1,81 @@
+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 olra.theworths.org (Postfix) with ESMTP id 539BE431FBF\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 18:42:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 VhT6jidcypff for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Nov 2012 18:42:52 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E7C30431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 18:42:51 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYpPl-0007ec-VR; Wed, 14 Nov 2012 22:42:50 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYpPg-0007Ss-A0; Wed, 14 Nov 2012 22:42:44 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] notmuch-restore: fix error message for extra positional\r
+       parameter.\r
+Date: Wed, 14 Nov 2012 22:42:39 -0400\r
+Message-Id: <1352947359-28181-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1352947359-28181-1-git-send-email-david@tethera.net>\r
+References: <1352947359-28181-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Thu, 15 Nov 2012 02:42:52 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+Note that a single positional parameter will take this code path also,\r
+so the old message really makes no sense anymore.\r
+---\r
+ notmuch-restore.c |    4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index 09dd691..7d8f44c 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -145,8 +145,8 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])\r
+ \r
+     if (opt_index < argc) {\r
+       fprintf (stderr,\r
+-       "Cannot read dump from more than one file: %s\n",\r
+-               argv[optind]);\r
++       "Unused positional parameter: %s\n",\r
++               argv[opt_index]);\r
+       return 1;\r
+     }\r
+ \r
+-- \r
+1.7.10.4\r
+\r