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

diff --git a/b7/35b9d4d68047598c46aa83707f13d596ef6710 b/b7/35b9d4d68047598c46aa83707f13d596ef6710
new file mode 100644 (file)
index 0000000..686d9fb
--- /dev/null
+++ b/b7/35b9d4d68047598c46aa83707f13d596ef6710
@@ -0,0 +1,124 @@
+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 0C374431FDA\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:12:46 -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 Ly+rAKtuAyDi for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Oct 2013 15:12:36 -0700 (PDT)\r
+Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com\r
+       [209.85.216.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AB54E431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:12:36 -0700 (PDT)\r
+Received: by mail-qc0-f176.google.com with SMTP id s19so4270064qcw.35\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:12:36 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=nc3Kx9foz5cywStn5uTV8fqfCRqaz27tN0CXfZAA98s=;\r
+       b=prStDkHxkfwYMPIjUyH952SynRV980KAtme7WzwZThHMOJ9KPx5aon+KXJuNcDRrYc\r
+       0pGiD80bKsPPQgpynCS9AABL6nOm5dm+68bui2oa4ShFcsi9bvaZWSBSKlsHj/nljhrW\r
+       oZ6Icjb42sgFlt+AP4SrlZkscXABsBqWQ2m4UhCTnPSpDWlOsKn8ViV50m9qNlEtOjiX\r
+       nu0KyMoufHQtu+YzSx0gdS6ACYS2/BDg/BgphgTv6e3XqGXIBncfKgSc8Z9byoghUE0F\r
+       6zfbBBDosXD4Ar4N59fNfs4lI/43cfZmSiaMnNATodLi1540tzw921kId+0D+Qd1kWnp\r
+       jqeg==\r
+X-Received: by 10.49.35.15 with SMTP id d15mr32205872qej.16.1382998355180;\r
+       Mon, 28 Oct 2013 15:12:35 -0700 (PDT)\r
+Received: from localhost (physicsnat56.physics.umass.edu. [128.119.50.38])\r
+       by mx.google.com with ESMTPSA id v19sm56969959qaw.0.2013.10.28.15.12.34\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 28 Oct 2013 15:12:34 -0700 (PDT)\r
+From: Ben Gamari <bgamari.foss@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/3] compact: Provide user with more error feedback\r
+In-Reply-To: <m2vc0i75cx.fsf@guru.guru-group.fi>\r
+References: <1382905807-22220-1-git-send-email-bgamari.foss@gmail.com>\r
+       <1382905807-22220-3-git-send-email-bgamari.foss@gmail.com>\r
+       <m2vc0i75cx.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.16+107~g1ef2773 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 28 Oct 2013 18:12:33 -0400\r
+Message-ID: <87k3gxdoz2.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\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:12:46 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+Tomi Ollila <tomi.ollila@iki.fi> writes:\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
+>>=20=20\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", s=\r
+trerror(errno));\r
+>> +   fprintf (stderr, "\n");\r
+>> +   fprintf (stderr, "Encountered error %s while moving the compacted data=\r
+base,\n",\r
+>> +            strerror(errno));\r
+>\r
+> You probably missed my comments in id:m2d2mz7qv7.fsf@guru.guru-group.fi ?\r
+>\r
+Indeed I did. My apologies. New set coming.\r
+\r
+Cheers,\r
+\r
+=2D Ben\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.14 (GNU/Linux)\r
+\r
+iQEcBAEBAgAGBQJSbuFRAAoJEErkyLZmeNiDoU0IAIUNvJRyYafxTBynQWLQ1ZmZ\r
+XORG/iFxSe06v2fMvsYQhHUawczBI4qJ5c7IZ44jp9JLSL6oBIITsre8Joyi/+fL\r
+JE2px4aVaPnQ95xilEE2BQxnL6K25NuWozmd2Su7XXgcGZTqaCqjQNccT9hgP9bC\r
+11/vQ+RVoBg7HBOJrlaRAm5MaC6abQDe5iJ8GUtd4GydqNH7McbIq5xlvlLBUnvL\r
+59jNKYtH5WnuZgJ2cQkv5acW6aLJMmMkyfRGAFlWjwvjOaeUC5nGqtJb/aZM2KKb\r
+biVoBJim8W+3IxAuT0AmF21ZSFPipiJhN5EX7150q1w0oJO5tic1TnRF1H2lg/U=\r
+=8kZn\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r