03/aeebef026fab4584f337b18ced216546e01b99

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 329A6431FB6\r
   6         for <notmuch@notmuchmail.org>; Fri,  1 Jun 2012 07:17:14 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 5zR7sZ5KUrMz for <notmuch@notmuchmail.org>;\r
  16         Fri,  1 Jun 2012 07:17:12 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 06135431FAF\r
  20         for <notmuch@notmuchmail.org>; Fri,  1 Jun 2012 07:17:11 -0700 (PDT)\r
  21 X-AuditID: 1209190c-b7fb16d000000926-4f-4fc8cee72196\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 47.D6.02342.7EEC8CF4; Fri,  1 Jun 2012 10:17:11 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q51EHAQn005535; \r
  27         Fri, 1 Jun 2012 10:17:10 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q51EH906006361\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Fri, 1 Jun 2012 10:17:10 -0400 (EDT)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1SaSep-0005qC-HU; Fri, 01 Jun 2012 10:16:51 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH] notmuch-deliver: Update to new notmuch_database_open API\r
  41 Date: Fri,  1 Jun 2012 10:16:49 -0400\r
  42 Message-Id: <1338560209-22406-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6nrvv83Al/g9PTFS0WPIm1uH5zJrMD\r
  46         k8fOWXfZPZ6tusUcwBTFZZOSmpNZllqkb5fAlbH99krWgs2cFTcXbmBvYLzN3sXIySEhYCLR\r
  47         eewcE4QtJnHh3no2EFtIYB+jxK/Fhl2MXED2ekaJrW1/mSGch0wSD5YegHLmMkqc+roErIVN\r
  48         QENi2/7ljCC2iIC0xM67s1lBbGYBR4mzv3rB1gkLeErsP3kPbB2LgKrEnGN9YPW8Ag4Sf09d\r
  49         ZoU4Q17i6f0+tgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbopaaUbmIEBQan\r
  50         JM8OxjcHlQ4xCnAwKvHwds057i/EmlhWXJl7iFGSg0lJlHf+2RP+QnxJ+SmVGYnFGfFFpTmp\r
  51         xYcYJTiYlUR4+c8A5XhTEiurUovyYVLSHCxK4rwrNXf7CwmkJ5akZqemFqQWwWRlODiUJHhF\r
  52         gREgJFiUmp5akZaZU4KQZuLgBBnOAzT8Hchi3uKCxNzizHSI/ClGRSlx3g0gCQGQREZpHlwv\r
  53         LHJfMYoDvSLMywKyggcY9XDdr4AGMwEN/n/2KMjgkkSElFQDY3vzZblzt/vebN6qmmn9P784\r
  54         Iu3l6emNDSv+zjrwc80slQMbruVaTP4Z/kHM9s6GlymTQ9/fry7ZXmE+2XV6T4vIY68shRUV\r
  55         jvumKLfWnEzxdgrz+1fx/XHBqeJHP1sy3dVOcXclx/a0FkVdDHmxaYr6Mb/Sj64vYzPnCK5V\r
  56         zyjo+byiioW9QImlOCPRUIu5qDgRAC1Uooe3AgAA\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Fri, 01 Jun 2012 14:17:14 -0000\r
  70 \r
  71 Commit 5fddc07 changed this API, but missed this use of it.\r
  72 ---\r
  73  contrib/notmuch-deliver/src/main.c |   10 +++++++++-\r
  74  1 file changed, 9 insertions(+), 1 deletion(-)\r
  75 \r
  76 diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c\r
  77 index 37d2919..032b9d6 100644\r
  78 --- a/contrib/notmuch-deliver/src/main.c\r
  79 +++ b/contrib/notmuch-deliver/src/main.c\r
  80 @@ -359,6 +359,7 @@ main(int argc, char **argv)\r
  81         GOptionContext *ctx;\r
  82         GError *error = NULL;\r
  83         notmuch_database_t *db;\r
  84 +       notmuch_status_t status;\r
  85  \r
  86         ctx = g_option_context_new("[FOLDER]");\r
  87         g_option_context_add_main_entries(ctx, options, PACKAGE);\r
  88 @@ -429,7 +430,14 @@ main(int argc, char **argv)\r
  89                 maildir = g_strdup(db_path);\r
  90  \r
  91         g_debug("Opening notmuch database `%s'", db_path);\r
  92 -       db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE);\r
  93 +       status = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE,\r
  94 +                                      &db);\r
  95 +       if (status) {\r
  96 +           g_critical("Failed to open database `%s': %s",\r
  97 +                      db_path, notmuch_status_to_string(status));\r
  98 +           g_free(maildir);\r
  99 +           return EX_SOFTWARE;\r
 100 +       }\r
 101         g_free(db_path);\r
 102         if (db == NULL)\r
 103                 return EX_SOFTWARE;\r
 104 -- \r
 105 1.7.10\r
 106 \r