[PATCH] use notmuch_database_open_verbose

diff --git a/89/add0d068074b29979a4ab5e4d16ab9f76a5c9b b/89/add0d068074b29979a4ab5e4d16ab9f76a5c9b
new file mode 100644 (file)
index 0000000..005fe24
--- /dev/null
+++ b/89/add0d068074b29979a4ab5e4d16ab9f76a5c9b
@@ -0,0 +1,104 @@
+Return-Path: <patricktotzke@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B378F6DE1861\r
+ for <notmuch@notmuchmail.org>; Sat, 12 Mar 2016 07:17:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.82\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.82 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 8RBYAJ6bdCdr for <notmuch@notmuchmail.org>;\r
+ Sat, 12 Mar 2016 07:17:45 -0800 (PST)\r
+Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com\r
+ [74.125.82.51]) by arlo.cworth.org (Postfix) with ESMTPS id 9BCC36DE185F for\r
+ <notmuch@notmuchmail.org>; Sat, 12 Mar 2016 07:17:44 -0800 (PST)\r
+Received: by mail-wm0-f51.google.com with SMTP id p65so51511857wmp.0\r
+ for <notmuch@notmuchmail.org>; Sat, 12 Mar 2016 07:17:44 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id;\r
+ bh=1ZtyQndaBRc8UEDeObdKZhTMaEs8/GWaaoSyX/535F0=;\r
+ b=Mm556gkU4/CQuCTEBWl6l3U8KUkyrEOv10Fw/AhvklDDNy2S2pb2V9DqzRHFFoSHpi\r
+ X4rf5+kpiTqr3M18wxiCyWcqnkZtfWZqXXWkVqzgStm2HmCT6viurC1gicxYeMLRNo4G\r
+ nBTBynfDGf0eFsV45f/+XXmgQ8OnpVO2AiPolwQ+8WUfdWaA8SMhAgcqonWhfWMjUMEv\r
+ XS4oM8t3P0o5KdmdPlhC8BLc2OO+3zs7fw5jaOtE/9FGTqwllnReQOKr7pQiAQmRaJsV\r
+ divY81zCddLm7VByoqK/Gf9YB4KAJUB390KsLsScxwyBBSIj0/Lg8yDqB9GNvdY3eEDE\r
+ F3nw==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+ bh=1ZtyQndaBRc8UEDeObdKZhTMaEs8/GWaaoSyX/535F0=;\r
+ b=EkiDrINjoeC92ZNAovBa0BwyFO9g9EuV8r+G+Sy5YH/P2i06lzpY5IuYOfr+r+CHHA\r
+ hPMU2qqm4m7GKTN28BZ4B1aO8qsbdmF0BCS29UvmKL4KquBoWFS/dUxtw7O1tQzOHAYO\r
+ QHoR01i5ayzOrzSpzWuo6r+GmAIMPnndnJIHa94HoNXpr2S3nfxep3U7FMmldzwUlwtU\r
+ AYY385h9pLbbdVrx/KUvJVFmNsf1bjc9Lt+lAFRGrbQtkUyn2J8gOF651JAHvNN1OuDG\r
+ O3UrWooJ0YZ6BQy2H9QKLaUF/DEejkTc6aAKrt219TIO80k1eTfpOwQSj4XO5fsgaFBX\r
+ xVZw==\r
+X-Gm-Message-State:\r
+ AD7BkJLONLEmORvi+iNL8MiQsnDt+ee1M5c68tW6V4gvHVj2ZXDNuQ/gRwthXolXuksCLg==\r
+X-Received: by 10.194.184.139 with SMTP id\r
+ eu11mr17589762wjc.169.1457795863108;  Sat, 12 Mar 2016 07:17:43 -0800 (PST)\r
+Received: from localhost ([194.66.248.108])\r
+ by smtp.gmail.com with ESMTPSA id m6sm13585855wje.21.2016.03.12.07.17.40\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 12 Mar 2016 07:17:40 -0800 (PST)\r
+From: Patrick Totzke <patricktotzke@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] use notmuch_database_open_verbose\r
+Date: Sat, 12 Mar 2016 15:17:37 +0000\r
+Message-Id: <1457795857-12410-1-git-send-email-patricktotzke@gmail.com>\r
+X-Mailer: git-send-email 2.7.0\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 12 Mar 2016 15:17:46 -0000\r
+\r
+... instead of the deprecated notmuch_database_open\r
+when opening the database in notmuch.database.Database.open.\r
+This prevents the library to print Xapian exceptions to stderr.\r
+---\r
+ bindings/python/notmuch/database.py | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py\r
+index f304533..5400338 100644\r
+--- a/bindings/python/notmuch/database.py\r
++++ b/bindings/python/notmuch/database.py\r
+@@ -86,8 +86,8 @@ class Database(object):\r
+     _get_version.argtypes = [NotmuchDatabaseP]\r
+     _get_version.restype = c_uint\r
+ \r
+-    """notmuch_database_open"""\r
+-    _open = nmlib.notmuch_database_open\r
++    """notmuch_database_open_verbose"""\r
++    _open = nmlib.notmuch_database_open_verbose\r
+     _open.argtypes = [c_char_p, c_uint, POINTER(NotmuchDatabaseP)]\r
+     _open.restype = c_uint\r
+ \r
+@@ -201,7 +201,7 @@ class Database(object):\r
+ \r
+         This function is used by __init__() and usually does not need\r
+         to be called directly. It wraps the underlying\r
+-        *notmuch_database_open* function.\r
++        *notmuch_database_open_verbose* function.\r
+ \r
+         :param status: Open the database in read-only or read-write mode\r
+         :type status:  :attr:`MODE`\r
+-- \r
+2.7.0\r
+\r