[PATCH 1/3] go: update notmuch-addrlookup to the new API

diff --git a/22/3eba56dc40e23ad53cec60452486d59f9971d2 b/22/3eba56dc40e23ad53cec60452486d59f9971d2
new file mode 100644 (file)
index 0000000..3d2a1cc
--- /dev/null
+++ b/22/3eba56dc40e23ad53cec60452486d59f9971d2
@@ -0,0 +1,91 @@
+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 B5722431FBF\r
+       for <notmuch@notmuchmail.org>; Wed,  9 May 2012 03:23:36 -0700 (PDT)\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 qo7ikvcxs8QO for <notmuch@notmuchmail.org>;\r
+       Wed,  9 May 2012 03:23:36 -0700 (PDT)\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 35205431FB6\r
+       for <notmuch@notmuchmail.org>; Wed,  9 May 2012 03:23:35 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [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 974525885CB\r
+       for <notmuch@notmuchmail.org>; Wed,  9 May 2012 12:23:33 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 8A1ECDF2A5; Wed,  9 May 2012 12:23:16 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\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 ADC7BDF2A2;\r
+       Wed,  9 May 2012 12:23:10 +0200 (CEST)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1SS43I-0001rq-6F; Wed, 09 May 2012 12:23:24 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] go: update notmuch-addrlookup to the new API\r
+Date: Wed,  9 May 2012 12:23:06 +0200\r
+Message-Id:\r
+ <1336558988-6813-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To:\r
+ <1336558988-6813-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1336558988-6813-1-git-send-email-4winter@informatik.uni-hamburg.de>\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, 09 May 2012 10:23:37 -0000\r
+\r
+notmuch.OpenDatabase now returns a status indicating success or\r
+failure. Use this information to inform the user of any failures.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ bindings/go/cmds/notmuch-addrlookup.go |    8 ++++++--\r
+ 1 file changed, 6 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/bindings/go/cmds/notmuch-addrlookup.go b/bindings/go/cmds/notmuch-addrlookup.go\r
+index 16958e5..03699fb 100644\r
+--- a/bindings/go/cmds/notmuch-addrlookup.go\r
++++ b/bindings/go/cmds/notmuch-addrlookup.go\r
+@@ -209,8 +209,12 @@ func (self *address_matcher) run(name string) {\r
+       queries := [3]*notmuch.Query{}\r
+       \r
+       // open the database\r
+-      self.db = notmuch.OpenDatabase(self.user_db_path, \r
+-              notmuch.DATABASE_MODE_READ_ONLY)\r
++      if db, status := notmuch.OpenDatabase(self.user_db_path,\r
++              notmuch.DATABASE_MODE_READ_ONLY); status == notmuch.STATUS_SUCCESS {\r
++        self.db = db\r
++      } else {\r
++              log.Fatalf("Failed to open the database: %v\n", status)\r
++      }\r
+ \r
+       // pass 1: look at all from: addresses with the address book tag\r
+       query := "tag:" + self.user_addrbook_tag\r
+-- \r
+1.7.10\r
+\r