From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 3F14E6DE0927 for ; Wed, 5 Oct 2016 04:34:54 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.007 X-Spam-Level: X-Spam-Status: No, score=-0.007 tagged_above=-999 required=5 tests=[AWL=0.004, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FibD5Tdsya1J for ; Wed, 5 Oct 2016 04:34:52 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 8B2336DE0946 for ; Wed, 5 Oct 2016 04:34:45 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1brkT1-0000v1-6Y; Wed, 05 Oct 2016 07:34:31 -0400 Received: (nullmailer pid 2912 invoked by uid 1000); Wed, 05 Oct 2016 11:34:40 -0000 From: David Bremner 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 Message-Id: <20161005113434.2847-2-david@tethera.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161005113434.2847-1-david@tethera.net> References: <20161005113434.2847-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2016 11:34:54 -0000 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