unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 03/10] python: handle return status of database close and destroy
Date: Wed, 16 Apr 2014 22:59:18 +1000	[thread overview]
Message-ID: <1397653165-15620-4-git-send-email-novalazy@gmail.com> (raw)
In-Reply-To: <1397653165-15620-1-git-send-email-novalazy@gmail.com>

Throw an exception if notmuch_database_close or notmuch_database_destroy
fail.
---
 bindings/python/notmuch/database.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py
index 7ddf5cf..5b58e09 100644
--- a/bindings/python/notmuch/database.py
+++ b/bindings/python/notmuch/database.py
@@ -157,11 +157,13 @@ class Database(object):
 
     _destroy = nmlib.notmuch_database_destroy
     _destroy.argtypes = [NotmuchDatabaseP]
-    _destroy.restype = None
+    _destroy.restype = c_uint
 
     def __del__(self):
         if self._db:
-            self._destroy(self._db)
+            status = self._destroy(self._db)
+            if status != STATUS.SUCCESS:
+                raise NotmuchError(status)
 
     def _assert_db_is_initialized(self):
         """Raises :exc:`NotInitializedError` if self._db is `None`"""
@@ -217,7 +219,7 @@ class Database(object):
 
     _close = nmlib.notmuch_database_close
     _close.argtypes = [NotmuchDatabaseP]
-    _close.restype = None
+    _close.restype = c_uint
 
     def close(self):
         '''
@@ -231,7 +233,9 @@ class Database(object):
             NotmuchError.
         '''
         if self._db:
-            self._close(self._db)
+            status = self._close(self._db)
+            if status != STATUS.SUCCESS:
+                raise NotmuchError(status)
 
     def __enter__(self):
         '''
-- 
1.8.4

  parent reply	other threads:[~2014-04-16 13:00 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-16 12:59 [PATCH v2 00/10] add insert --must-index option Peter Wang
2014-04-16 12:59 ` [PATCH v2 01/10] lib: add return status to database close and destroy Peter Wang
2014-07-05 12:39   ` David Bremner
2014-07-09 23:41   ` David Bremner
2014-04-16 12:59 ` [PATCH v2 02/10] lib: bump soname Peter Wang
2014-04-16 12:59 ` Peter Wang [this message]
2014-07-05 12:43   ` [PATCH v2 03/10] python: handle return status of database close and destroy David Bremner
2014-04-16 12:59 ` [PATCH v2 04/10] go: add return status to database close method Peter Wang
2014-04-16 12:59 ` [PATCH v2 05/10] ruby: handle return status of database close Peter Wang
2014-07-05 12:55   ` David Bremner
2014-04-16 12:59 ` [PATCH v2 06/10] cli: refactor insert Peter Wang
2014-07-05 13:18   ` David Bremner
2014-07-06  3:57     ` Peter Wang
2014-07-08 23:24       ` David Bremner
2014-09-16 19:32       ` David Bremner
2014-04-16 12:59 ` [PATCH v2 07/10] cli: indicate insert failure mode in exit status Peter Wang
2014-04-16 12:59 ` [PATCH v2 08/10] cli: add insert --must-index option Peter Wang
2014-07-09 23:20   ` David Bremner
2014-07-28 14:48     ` Peter Wang
2014-04-16 12:59 ` [PATCH v2 09/10] test: test insert --must-index Peter Wang
2014-04-16 12:59 ` [PATCH v2 10/10] man: update insert documentation Peter Wang
2014-05-06 21:00 ` [PATCH v2 00/10] add insert --must-index option Tomi Ollila

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=1397653165-15620-4-git-send-email-novalazy@gmail.com \
    --to=novalazy@gmail.com \
    --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).