fix notmuch_database_close

diff --git a/7e/f5d3c772245114f733b461a60e6e639e6301a8 b/7e/f5d3c772245114f733b461a60e6e639e6301a8
new file mode 100644 (file)
index 0000000..f36157c
--- /dev/null
+++ b/7e/f5d3c772245114f733b461a60e6e639e6301a8
@@ -0,0 +1,80 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 72EA5431FD4\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 01:19:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id d31O1MgM-jYF for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Feb 2012 01:19:28 -0800 (PST)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E5AEF431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 01:19:27 -0800 (PST)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 173ED4F2EBE\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:19:26 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id F1A6EDF2A7; Wed, 29 Feb 2012 10:19:23 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 49CE7DF2A2\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:19:23 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1S2fgw-00068P-Ed\r
+       for notmuch@notmuchmail.org; Wed, 29 Feb 2012 10:19:22 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: fix notmuch_database_close\r
+Date: Wed, 29 Feb 2012 10:19:16 +0100\r
+Message-Id:\r
+ <1330507157-22859-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 29 Feb 2012 09:19:29 -0000\r
+\r
+Pazz mentioned a problem wrt reopening a notmuch database immediately\r
+after it has been closed. The problem can be reproduced with this test\r
+case:\r
+\r
+~~~ snip ~~~\r
+import os\r
+import notmuch\r
+\r
+db_path = os.path.expanduser('~/Maildir')\r
+\r
+for i in range(2):\r
+    with notmuch.Database(db_path, mode=notmuch.Database.MODE.READ_WRITE) as db:\r
+        query = db.create_query('tag:inbox AND NOT tag:killed')\r
+        print(len(list(query.search_messages())))\r
+~~~ snap ~~~\r
+\r
+Without this fix, the second loop iteration fails because the xapian\r
+lock is not released in time.\r
+\r
+Cheers,\r
+Justus\r
+\r