[PATCH 2/4] compact: Give user more feedback on failure renaming

diff --git a/a4/5feea4280ee91d8d7fd6a5389b1a06f7cb06e8 b/a4/5feea4280ee91d8d7fd6a5389b1a06f7cb06e8
new file mode 100644 (file)
index 0000000..05e3224
--- /dev/null
+++ b/a4/5feea4280ee91d8d7fd6a5389b1a06f7cb06e8
@@ -0,0 +1,94 @@
+Return-Path: <bgamari.foss@gmail.com>\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 00B07431FDC\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:38 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 G0D7cLuE60vJ for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Oct 2013 15:23:33 -0700 (PDT)\r
+Received: from mail-qe0-f51.google.com (mail-qe0-f51.google.com\r
+       [209.85.128.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C6A4D431FDE\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:29 -0700 (PDT)\r
+Received: by mail-qe0-f51.google.com with SMTP id q19so4463318qeb.38\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:28 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=7X+fb0nSeZE2BNT42DDJTouunzR/OzzOAC/Lbh58NS4=;\r
+       b=gKmpDv5qXjupPa4m5890P/kznfmPeDM3EB64rB0zAg/yefMfO8WJDHtHx4ua+WjEFt\r
+       Wa07cOkFrtznthcyBglci0NXn+axBDHd8TsgErnz1giBkBPQLyi6DPzBfy6QbNEmgcRh\r
+       x2vpXgKo2PLbCAyxF5ZBSi9950Li9bkf1OfTQBgczJJjwYhOQ90Wj9jmJ30lLIi5MnKE\r
+       KoLLRX4s7i3aLWnuK+B43bUbolCakoJENNqvRKE9E/6HWdwOAeUCG5z4vSOKAboxFThT\r
+       N8tlT3lHQsAJFguVW2s8rwTLB8yzp09W1+Y3h5fFE7pRAlPdTGbLS5MTEszGFWFiVq7r\r
+       DEnw==\r
+X-Received: by 10.224.73.200 with SMTP id r8mr32972060qaj.72.1382999008229;\r
+       Mon, 28 Oct 2013 15:23:28 -0700 (PDT)\r
+Received: from ben-laptop.hasb.physics.cns (physicsnat56.physics.umass.edu.\r
+       [128.119.50.38])\r
+       by mx.google.com with ESMTPSA id x1sm57796293qai.6.2013.10.28.15.23.27\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+       Mon, 28 Oct 2013 15:23:27 -0700 (PDT)\r
+From: Ben Gamari <bgamari.foss@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/4] compact: Give user more feedback on failure renaming\r
+Date: Mon, 28 Oct 2013 18:23:15 -0400\r
+Message-Id: <1382998997-9938-2-git-send-email-bgamari.foss@gmail.com>\r
+X-Mailer: git-send-email 1.8.3.2\r
+In-Reply-To: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com>\r
+References: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com>\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: Mon, 28 Oct 2013 22:23:38 -0000\r
+\r
+Provide the user with instructions after we fail to move the old\r
+un-compacted database out of the way.\r
+\r
+Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
+---\r
+ lib/database.cc | 9 ++++++++-\r
+ 1 file changed, 8 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 06f1c0a..57c2292 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -922,7 +922,14 @@ notmuch_database_compact (const char* path,\r
+ \r
+     if (old_xapian_path != NULL) {\r
+       if (rename(xapian_path, old_xapian_path)) {\r
+-          fprintf (stderr, "Error moving old database out of the way\n");\r
++          fprintf (stderr, "Error moving old database out of the way: %s\n",\r
++                   strerror(errno));\r
++          fprintf (stderr, "\n");\r
++          fprintf (stderr, "Old database: %s\n", xapian_path);\r
++          fprintf (stderr, "Compacted database: %s\n", compact_xapian_path);\r
++          fprintf (stderr, "\n");\r
++          fprintf (stderr, "At this point it's probably best to remove the compacted database,\n");\r
++          fprintf (stderr, "find the cause of this error, and try compacting again.\n");\r
+           ret = NOTMUCH_STATUS_FILE_ERROR;\r
+           goto DONE;\r
+       }\r
+-- \r
+1.8.3.2\r
+\r