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