unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/2] lib: replace deprecated xapian call 'flush()' with 'commit()'
Date: Wed,  5 Oct 2016 08:34:33 -0300	[thread overview]
Message-ID: <20161005113434.2847-2-david@tethera.net> (raw)
In-Reply-To: <20161005113434.2847-1-david@tethera.net>

This will make notmuch incompatible with Xapian before 1.1.0, which is
more than 6 years old this point.
---
 lib/database.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/database.cc b/lib/database.cc
index 4bfae01..f76c375 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1723,7 +1723,7 @@ notmuch_database_end_atomic (notmuch_database_t *notmuch)
 	 * However, we rely on flushing to test atomicity. */
 	const char *thresh = getenv ("XAPIAN_FLUSH_THRESHOLD");
 	if (thresh && atoi (thresh) == 1)
-	    db->flush ();
+	    db->commit ();
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch, "A Xapian exception occurred committing transaction: %s.\n",
 		 error.get_msg().c_str());
-- 
2.9.3

  reply	other threads:[~2016-10-05 11:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-05 11:34 suppress deprecation warnings David Bremner
2016-10-05 11:34 ` David Bremner [this message]
2016-10-26  1:05   ` [PATCH 1/2] lib: replace deprecated xapian call 'flush()' with 'commit()' David Bremner
2016-10-05 11:34 ` [PATCH 2/2] lib: optionally silence Xapian deprecation warnings David Bremner
2016-11-15 12:12   ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161005113434.2847-2-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).