1 Return-Path: <bgamari.foss@gmail.com>
\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 3D2EA431FCB
\r
6 for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:24 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id x8fYobOyICAE for <notmuch@notmuchmail.org>;
\r
17 Mon, 14 Oct 2013 18:13:19 -0700 (PDT)
\r
18 Received: from mail-qc0-f170.google.com (mail-qc0-f170.google.com
\r
19 [209.85.216.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 6AC0B431FB6
\r
22 for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:14 -0700 (PDT)
\r
23 Received: by mail-qc0-f170.google.com with SMTP id n9so2453341qcw.15
\r
24 for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:12 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
27 bh=+hROSYcoG8KzSm0D0Kf3UyTBAyQsg3seDgzTXUKeIVE=;
\r
28 b=f0lCnZ6NmPbsxcU16P3LfFoTuaMDeZ8g3gIHd/gb9H+ZNA8JqCAryN4pJjv6WI8ZBk
\r
29 J5wmXVthFcseleQAfHgHlZIurOeVrS1YC+GSqc9SW4FMYJdLpEz0H1+lLn99jD5gT4A3
\r
30 KOWQJO05pr2Ds0P4AuSHvj5P+S5kvwOMr8dF+a05Swf9yfTK/D8H4SmLgBdNXn4DnT5G
\r
31 c1cL/4lo/bRB5r705Z+lV8q4QYuX82b/CtCIKWrU7rwoVQSi1xVSYX+cIvDIgpsO4tpr
\r
32 F8HKUvfP4Tk5mZ6lv4CJoZRdfq0dc8vMw8a5A4xPYybHJ1MEzFn3hfpKs+F3GcV+ZEha
\r
34 X-Received: by 10.229.65.201 with SMTP id k9mr42011135qci.11.1381799592837;
\r
35 Mon, 14 Oct 2013 18:13:12 -0700 (PDT)
\r
36 Received: from localhost.localdomain
\r
37 (pool-108-8-224-250.spfdma.east.verizon.net. [108.8.224.250])
\r
38 by mx.google.com with ESMTPSA id
\r
39 og1sm105736333qeb.3.1969.12.31.16.00.00
\r
40 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
\r
41 Mon, 14 Oct 2013 18:13:12 -0700 (PDT)
\r
42 From: Ben Gamari <bgamari.foss@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH 2/3] compact: Give user more feedback on failure renaming
\r
45 Date: Mon, 14 Oct 2013 21:13:04 -0400
\r
46 Message-Id: <1381799585-16274-3-git-send-email-bgamari.foss@gmail.com>
\r
47 X-Mailer: git-send-email 1.8.1.2
\r
48 In-Reply-To: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>
\r
49 References: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Tue, 15 Oct 2013 01:13:24 -0000
\r
64 Provide the user with instructions after we fail to move the old
\r
65 un-compacted database out of the way.
\r
67 Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
\r
69 lib/database.cc | 9 ++++++++-
\r
70 1 file changed, 8 insertions(+), 1 deletion(-)
\r
72 diff --git a/lib/database.cc b/lib/database.cc
\r
73 index 06f1c0a..57c2292 100644
\r
74 --- a/lib/database.cc
\r
75 +++ b/lib/database.cc
\r
76 @@ -922,7 +922,14 @@ notmuch_database_compact (const char* path,
\r
78 if (old_xapian_path != NULL) {
\r
79 if (rename(xapian_path, old_xapian_path)) {
\r
80 - fprintf (stderr, "Error moving old database out of the way\n");
\r
81 + fprintf (stderr, "Error moving old database out of the way: %s\n",
\r
83 + fprintf (stderr, "\n");
\r
84 + fprintf (stderr, "Old database: %s\n", xapian_path);
\r
85 + fprintf (stderr, "Compacted database: %s\n", compact_xapian_path);
\r
86 + fprintf (stderr, "\n");
\r
87 + fprintf (stderr, "At this point it's probably best to remove the compacted database,\n");
\r
88 + fprintf (stderr, "find the cause of this error, and try compacting again.\n");
\r
89 ret = NOTMUCH_STATUS_FILE_ERROR;
\r