[PATCH] notmuch-deliver: Update to new notmuch_database_open API

diff --git a/03/aeebef026fab4584f337b18ced216546e01b99 b/03/aeebef026fab4584f337b18ced216546e01b99
new file mode 100644 (file)
index 0000000..5e33978
--- /dev/null
+++ b/03/aeebef026fab4584f337b18ced216546e01b99
@@ -0,0 +1,106 @@
+Return-Path: <amdragon@mit.edu>\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 329A6431FB6\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Jun 2012 07:17:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 5zR7sZ5KUrMz for <notmuch@notmuchmail.org>;\r
+       Fri,  1 Jun 2012 07:17:12 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 06135431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Jun 2012 07:17:11 -0700 (PDT)\r
+X-AuditID: 1209190c-b7fb16d000000926-4f-4fc8cee72196\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 47.D6.02342.7EEC8CF4; Fri,  1 Jun 2012 10:17:11 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q51EHAQn005535; \r
+       Fri, 1 Jun 2012 10:17:10 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q51EH906006361\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 1 Jun 2012 10:17:10 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SaSep-0005qC-HU; Fri, 01 Jun 2012 10:16:51 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] notmuch-deliver: Update to new notmuch_database_open API\r
+Date: Fri,  1 Jun 2012 10:16:49 -0400\r
+Message-Id: <1338560209-22406-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6nrvv83Al/g9PTFS0WPIm1uH5zJrMD\r
+       k8fOWXfZPZ6tusUcwBTFZZOSmpNZllqkb5fAlbH99krWgs2cFTcXbmBvYLzN3sXIySEhYCLR\r
+       eewcE4QtJnHh3no2EFtIYB+jxK/Fhl2MXED2ekaJrW1/mSGch0wSD5YegHLmMkqc+roErIVN\r
+       QENi2/7ljCC2iIC0xM67s1lBbGYBR4mzv3rB1gkLeErsP3kPbB2LgKrEnGN9YPW8Ag4Sf09d\r
+       ZoU4Q17i6f0+tgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbopaaUbmIEBQan\r
+       JM8OxjcHlQ4xCnAwKvHwds057i/EmlhWXJl7iFGSg0lJlHf+2RP+QnxJ+SmVGYnFGfFFpTmp\r
+       xYcYJTiYlUR4+c8A5XhTEiurUovyYVLSHCxK4rwrNXf7CwmkJ5akZqemFqQWwWRlODiUJHhF\r
+       gREgJFiUmp5akZaZU4KQZuLgBBnOAzT8Hchi3uKCxNzizHSI/ClGRSlx3g0gCQGQREZpHlwv\r
+       LHJfMYoDvSLMywKyggcY9XDdr4AGMwEN/n/2KMjgkkSElFQDY3vzZblzt/vebN6qmmn9P784\r
+       Iu3l6emNDSv+zjrwc80slQMbruVaTP4Z/kHM9s6GlymTQ9/fry7ZXmE+2XV6T4vIY68shRUV\r
+       jvumKLfWnEzxdgrz+1fx/XHBqeJHP1sy3dVOcXclx/a0FkVdDHmxaYr6Mb/Sj64vYzPnCK5V\r
+       zyjo+byiioW9QImlOCPRUIu5qDgRAC1Uooe3AgAA\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: Fri, 01 Jun 2012 14:17:14 -0000\r
+\r
+Commit 5fddc07 changed this API, but missed this use of it.\r
+---\r
+ contrib/notmuch-deliver/src/main.c |   10 +++++++++-\r
+ 1 file changed, 9 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c\r
+index 37d2919..032b9d6 100644\r
+--- a/contrib/notmuch-deliver/src/main.c\r
++++ b/contrib/notmuch-deliver/src/main.c\r
+@@ -359,6 +359,7 @@ main(int argc, char **argv)\r
+       GOptionContext *ctx;\r
+       GError *error = NULL;\r
+       notmuch_database_t *db;\r
++      notmuch_status_t status;\r
+ \r
+       ctx = g_option_context_new("[FOLDER]");\r
+       g_option_context_add_main_entries(ctx, options, PACKAGE);\r
+@@ -429,7 +430,14 @@ main(int argc, char **argv)\r
+               maildir = g_strdup(db_path);\r
+ \r
+       g_debug("Opening notmuch database `%s'", db_path);\r
+-      db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE);\r
++      status = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE,\r
++                                     &db);\r
++      if (status) {\r
++          g_critical("Failed to open database `%s': %s",\r
++                     db_path, notmuch_status_to_string(status));\r
++          g_free(maildir);\r
++          return EX_SOFTWARE;\r
++      }\r
+       g_free(db_path);\r
+       if (db == NULL)\r
+               return EX_SOFTWARE;\r
+-- \r
+1.7.10\r
+\r