66/c00ef3ce2a7af625fd61026be4f9513a6684a9

   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 29442431FD5\r
   6         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:27 -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 IORQbugeM98N for <notmuch@notmuchmail.org>;\r
  16         Sun, 13 May 2012 16:36:24 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id A78C2431FBD\r
  20         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:23 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7fd86d0000008b4-4c-4fb04576ea48\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 90.32.02228.67540BF4; Sun, 13 May 2012 19:36:22 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4DNaLva025784; \r
  27         Sun, 13 May 2012 19:36:22 -0400\r
  28 Received: from drake.mit.edu\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 q4DNaKS2001100\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 13 May 2012 19:36:21 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1STiKq-0004YS-9o; Sun, 13 May 2012 19:36:20 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 4/5] ruby: Update for changes to\r
  41         notmuch_database_get_directory\r
  42 Date: Sun, 13 May 2012 19:36:12 -0400\r
  43 Message-Id: <1336952173-17422-5-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1336939029-13969-1-git-send-email-amdragon@mit.edu>\r
  47         <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsUixCmqrFvmusHfYPIfLovZrT+YLG60djNa\r
  50         NE13trh+cyazxZuV81gdWD0Of13I4jHx/Gk2j1v3X7N7PFt1i9ljy6H3zAGsUVw2Kak5mWWp\r
  51         Rfp2CVwZ+8+eYi5YyVEx/aZOA+MFti5GTg4JAROJhVc+MULYYhIX7q0HinNxCAnsY5SYtaCb\r
  52         BcLZwChx81kXM4Rzn0niyY13TBDOLEaJ1bcmg81iE9CQ2LZ/OdgsEQFpiZ13Z7OCFDELdDFK\r
  53         /H7TDNTOwSEsECTx7EEQSA2LgKrE9gufWEBsXgEHic+P17JD3CEv8fR+H9hMTgFHib4HH8Hi\r
  54         QgLlEjPar7NMYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdYLzezRC81pXQTIzgIJfl2\r
  55         MH49qHSIUYCDUYmH95XpBn8h1sSy4srcQ4ySHExKorxMTkAhvqT8lMqMxOKM+KLSnNTiQ4wS\r
  56         HMxKIrzrH673F+JNSaysSi3Kh0lJc7AoifOqab3zExJITyxJzU5NLUgtgsnKcHAoSfAudgEa\r
  57         KliUmp5akZaZU4KQZuLgBBnOAzT8DEgNb3FBYm5xZjpE/hSjopQ47xWQhABIIqM0D64XliRe\r
  58         MYoDvSLMWw9SxQNMMHDdr4AGMwEN5hdYBzK4JBEhJdXAGLTk/ssZwZNWf3t7V8GsWzv3rZpM\r
  59         iHfE8nOxgbvFOiMYOs/ctW3O6AoLTlruy3m8P/5Jg3zgpHfl0Q5nY9ir3wt7dhsG759d03XL\r
  60         /RNvTa6YG3fGsSXTZl6cmGsSxV0gNNPW/Z7Mn/B7J3WOlP1l8/vbveT4XPutMzyaZzst09xc\r
  61         MiP754EKJZbijERDLeai4kQA7jR7pe0CAAA=\r
  62 Cc: tomi.ollila@iki.fi\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Sun, 13 May 2012 23:36:27 -0000\r
  76 \r
  77 ---\r
  78  bindings/ruby/database.c |   11 ++++++-----\r
  79  1 file changed, 6 insertions(+), 5 deletions(-)\r
  80 \r
  81 diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c\r
  82 index 409d54f..e84f726 100644\r
  83 --- a/bindings/ruby/database.c\r
  84 +++ b/bindings/ruby/database.c\r
  85 @@ -252,6 +252,7 @@ VALUE\r
  86  notmuch_rb_database_get_directory (VALUE self, VALUE pathv)\r
  87  {\r
  88      const char *path;\r
  89 +    notmuch_status_t ret;\r
  90      notmuch_directory_t *dir;\r
  91      notmuch_database_t *db;\r
  92  \r
  93 @@ -260,11 +261,11 @@ notmuch_rb_database_get_directory (VALUE self, VALUE pathv)\r
  94      SafeStringValue (pathv);\r
  95      path = RSTRING_PTR (pathv);\r
  96  \r
  97 -    dir = notmuch_database_get_directory (db, path);\r
  98 -    if (!dir)\r
  99 -        rb_raise (notmuch_rb_eXapianError, "Xapian exception");\r
 100 -\r
 101 -    return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir);\r
 102 +    ret = notmuch_database_get_directory (db, path, &dir);\r
 103 +    notmuch_rb_status_raise (ret);\r
 104 +    if (dir)\r
 105 +       return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir);\r
 106 +    return Qnil;\r
 107  }\r
 108  \r
 109  /*\r
 110 -- \r
 111 1.7.10\r
 112 \r