1 Return-Path: <bremner@pivot.cs.unb.ca>
\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 6C13B429E21
\r
6 for <notmuch@notmuchmail.org>; Fri, 28 Oct 2011 07:56:47 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\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 TksW1qlyJwTH for <notmuch@notmuchmail.org>;
\r
16 Fri, 28 Oct 2011 07:56:46 -0700 (PDT)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id B35BF431FB6
\r
21 for <notmuch@notmuchmail.org>; Fri, 28 Oct 2011 07:56:46 -0700 (PDT)
\r
22 Received: from convex-new.cs.unb.ca ([131.202.13.154])
\r
23 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9SEudDO014871;
\r
24 Fri, 28 Oct 2011 11:56:41 -0300
\r
25 Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72)
\r
26 (envelope-from <bremner@pivot.cs.unb.ca>)
\r
27 id 1RJnrL-0004XT-KI; Fri, 28 Oct 2011 11:56:39 -0300
\r
28 From: David Bremner <david@tethera.net>
\r
29 To: notmuch@notmuchmail.org
\r
30 Subject: [PATCH] lib/database.cc: use flush Xapian method instead of commit
\r
31 Date: Fri, 28 Oct 2011 11:56:30 -0300
\r
32 Message-Id: <1319813790-17418-1-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 1.7.5.4
\r
34 Cc: David Bremner <bremner@debian.org>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Fri, 28 Oct 2011 14:56:48 -0000
\r
49 From: David Bremner <bremner@debian.org>
\r
51 Apparently the method was renamed in Xapian 1.1.0 but the old method
\r
52 name will stay around for a while. It seems better to stick with the
\r
53 old name to make notmuch compile with older versions of Xapian, at
\r
56 lib/database.cc | 2 +-
\r
57 1 files changed, 1 insertions(+), 1 deletions(-)
\r
59 diff --git a/lib/database.cc b/lib/database.cc
\r
60 index e77fd53..5440df2 100644
\r
61 --- a/lib/database.cc
\r
62 +++ b/lib/database.cc
\r
63 @@ -1030,7 +1030,7 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch)
\r
64 * However, we rely on flushing to test atomicity. */
\r
65 const char *thresh = getenv ("XAPIAN_FLUSH_THRESHOLD");
\r
66 if (thresh && atoi (thresh) == 1)
\r
69 } catch (const Xapian::Error &error) {
\r
70 fprintf (stderr, "A Xapian exception occurred committing transaction: %s.\n",
\r
71 error.get_msg().c_str());
\r