Re: [PATCH 3/3] compact: Provide user with more error feedback

diff --git a/5b/e6286844716b205246beaca445b9222e953b95 b/5b/e6286844716b205246beaca445b9222e953b95
new file mode 100644 (file)
index 0000000..6728610
--- /dev/null
+++ b/5b/e6286844716b205246beaca445b9222e953b95
@@ -0,0 +1,102 @@
+Return-Path: <tomi.ollila@iki.fi>\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 33DB7429E2E\r
+       for <notmuch@notmuchmail.org>; Sun, 27 Oct 2013 14:48:28 -0700 (PDT)\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 fQ98vPSntiia for <notmuch@notmuchmail.org>;\r
+       Sun, 27 Oct 2013 14:48:22 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 94FCD429E29\r
+       for <notmuch@notmuchmail.org>; Sun, 27 Oct 2013 14:48:22 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 99D841000B2;\r
+       Sun, 27 Oct 2013 23:48:14 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Ben Gamari <bgamari.foss@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/3] compact: Provide user with more error feedback\r
+In-Reply-To: <1382905807-22220-3-git-send-email-bgamari.foss@gmail.com>\r
+References: <1382905807-22220-1-git-send-email-bgamari.foss@gmail.com>\r
+       <1382905807-22220-3-git-send-email-bgamari.foss@gmail.com>\r
+User-Agent: Notmuch/0.16+115~g11c2ff5 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 27 Oct 2013 23:48:14 +0200\r
+Message-ID: <m2vc0i75cx.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 27 Oct 2013 21:48:28 -0000\r
+\r
+On Sun, Oct 27 2013, Ben Gamari <bgamari.foss@gmail.com> wrote:\r
+\r
+> Provide instructions on what to do when we couldn't move the compacted\r
+> database into place.\r
+>\r
+> Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
+> ---\r
+>  lib/database.cc | 18 +++++++++++++++++-\r
+>  1 file changed, 17 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 57c2292..6f9fed1 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -938,7 +938,23 @@ notmuch_database_compact (const char* path,\r
+>      }\r
+>  \r
+>      if (rename(compact_xapian_path, xapian_path)) {\r
+> -    fprintf (stderr, "Error moving compacted database\n");\r
+> +    fprintf (stderr, "Error moving compacted database into place: %s\n", strerror(errno));\r
+> +    fprintf (stderr, "\n");\r
+> +    fprintf (stderr, "Encountered error %s while moving the compacted database,\n",\r
+> +             strerror(errno));\r
+\r
+You probably missed my comments in id:m2d2mz7qv7.fsf@guru.guru-group.fi ?\r
+\r
+Tomi\r
+\r
+> +    fprintf (stderr, "\n");\r
+> +    fprintf (stderr, "    %s\n", compact_xapian_path);\r
+> +    fprintf (stderr, "\n");\r
+> +    fprintf (stderr, "to\n");\r
+> +    fprintf (stderr, "\n");\r
+> +    fprintf (stderr, "    %s\n", xapian_path);\r
+> +    fprintf (stderr, "\n");\r
+> +    fprintf (stderr, "Please identify the reason for this and move the compacted database into place manually.\n");\r
+> +    if (backup_path != NULL) {\r
+> +        fprintf (stderr, "Otherwise, you can revert to the backup database located at,\n");\r
+> +        fprintf (stderr, "\n");\r
+> +        fprintf (stderr, "    %s\n", backup_path);\r
+> +    }\r
+>      ret = NOTMUCH_STATUS_FILE_ERROR;\r
+>      goto DONE;\r
+>      }\r
+> -- \r
+> 1.8.3.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r