1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 39CB2431FC2
\r
6 for <notmuch@notmuchmail.org>; Sun, 20 Oct 2013 11:14:02 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id lt9+KOQZbWua for <notmuch@notmuchmail.org>;
\r
16 Sun, 20 Oct 2013 11:13:25 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id D155D431FC0
\r
19 for <notmuch@notmuchmail.org>; Sun, 20 Oct 2013 11:13:24 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id EC09F10007D;
\r
22 Sun, 20 Oct 2013 21:13:16 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Ben Gamari <bgamari.foss@gmail.com>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH 3/3] compact: Provide user with more error feedback
\r
26 In-Reply-To: <1381799585-16274-4-git-send-email-bgamari.foss@gmail.com>
\r
27 References: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>
\r
28 <1381799585-16274-4-git-send-email-bgamari.foss@gmail.com>
\r
29 User-Agent: Notmuch/0.16+112~g46b74be (http://notmuchmail.org) Emacs/24.3.1
\r
30 (x86_64-unknown-linux-gnu)
\r
31 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
32 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
33 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
34 Date: Sun, 20 Oct 2013 21:13:16 +0300
\r
35 Message-ID: <m2d2mz7qv7.fsf@guru.guru-group.fi>
\r
37 Content-Type: text/plain
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.13
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Sun, 20 Oct 2013 18:14:02 -0000
\r
52 On Tue, Oct 15 2013, Ben Gamari <bgamari.foss@gmail.com> wrote:
\r
54 > Provide instructions on what to do when we couldn't move the compacted
\r
55 > database into place.
\r
57 > Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
\r
59 > lib/database.cc | 18 +++++++++++++++++-
\r
60 > 1 file changed, 17 insertions(+), 1 deletion(-)
\r
62 > diff --git a/lib/database.cc b/lib/database.cc
\r
63 > index 57c2292..6f9fed1 100644
\r
64 > --- a/lib/database.cc
\r
65 > +++ b/lib/database.cc
\r
66 > @@ -938,7 +938,23 @@ notmuch_database_compact (const char* path,
\r
69 > if (rename(compact_xapian_path, xapian_path)) {
\r
70 > - fprintf (stderr, "Error moving compacted database\n");
\r
71 > + fprintf (stderr, "Error moving compacted database into place: %s\n", strerror(errno));
\r
72 > + fprintf (stderr, "\n");
\r
73 > + fprintf (stderr, "Encountered error %s while moving the compacted database,\n",
\r
74 > + strerror(errno));
\r
76 At this point 'errno' may have changed, so the above error string might not
\r
77 be the same. Maybe removing the '%s ' part altogether as inserting the part
\r
78 looks a bit strange...
\r
80 > + fprintf (stderr, "\n");
\r
81 > + fprintf (stderr, " %s\n", compact_xapian_path);
\r
82 > + fprintf (stderr, "\n");
\r
83 > + fprintf (stderr, "to\n");
\r
84 > + fprintf (stderr, "\n");
\r
85 > + fprintf (stderr, " %s\n", xapian_path);
\r
86 > + fprintf (stderr, "\n");
\r
87 > + fprintf (stderr, "Please identify the reason for this and move the compacted database into place manually.\n");
\r
88 > + if (backup_path != NULL) {
\r
89 > + fprintf (stderr, "Otherwise, you can revert to the backup database located at,\n");
\r
91 the commas (,) here and a few lines above looks a bit strange to me.
\r
93 > + fprintf (stderr, "\n");
\r
94 > + fprintf (stderr, " %s\n", backup_path);
\r
96 Maybe saying something how to do this revert would be enlightening to the
\r
97 user... (i.e. mentioning that backup_path needs to be moved as xapian_path).
\r
102 > ret = NOTMUCH_STATUS_FILE_ERROR;
\r