ac/0c699d1aab1ca6a105b3d4a31659f44ecbc312

   1 Return-Path: <amthrax@drake.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 CFD96431FD0\r
   6         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 12:57:25 -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 kMhWeqHPbJkj for <notmuch@notmuchmail.org>;\r
  16         Sun, 13 May 2012 12:57: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 2C6A4431FC4\r
  20         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 12:57:23 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7fd86d0000008b4-21-4fb01221e225\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 6A.0C.02228.12210BF4; Sun, 13 May 2012 15:57:21 -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 q4DJvKmk007435; \r
  27         Sun, 13 May 2012 15:57:20 -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 q4DJvGEk022911\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 13 May 2012 15:57:17 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1STeuq-0003ew-2D; Sun, 13 May 2012 15:57:16 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 4/5] ruby: Update for changes to\r
  41  notmuch_database_get_directory\r
  42 Date: Sun, 13 May 2012 15:57:08 -0400\r
  43 Message-Id: <1336939029-13969-5-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1336939029-13969-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1336939029-13969-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsUixCmqrKsotMHf4MFMA4vZrT+YLG60djNa\r
  49         NE13trh+cyazxZuV81gdWD0Of13I4jHx/Gk2j1v3X7N7PFt1i9ljy6H3zAGsUVw2Kak5mWWp\r
  50         Rfp2CVwZ+8+eYi5YyVEx/aZOA+MFti5GTg4JAROJxo0tULaYxIV764FsLg4hgX2MEtc/HGeC\r
  51         cDYwSvT8nMUK4dxnkrg/aQVUZj6jxI3bxxlB+tkENCS27V8OZosISEvsvDsbrINZoItR4veb\r
  52         ZmaQhLCAv8Sco9eBijg4WARUJQ5PUQcJ8wo4SCx8MJcd4g55iaf3+8Bu4hRwlFh2ZSFYqxBQ\r
  53         zcmPf5knMPIvYGRYxSibklulm5uYmVOcmqxbnJyYl5dapGusl5tZopeaUrqJERyEknw7GL8e\r
  54         VDrEKMDBqMTDu0B0vb8Qa2JZcWXuIUZJDiYlUd40wQ3+QnxJ+SmVGYnFGfFFpTmpxYcYJTiY\r
  55         lUR41z8EKudNSaysSi3Kh0lJc7AoifOqab3zExJITyxJzU5NLUgtgsnKcHAoSfAaggwVLEpN\r
  56         T61Iy8wpQUgzcXCCDOcBGp4CUsNbXJCYW5yZDpE/xagoJc5rAJIQAElklObB9cKSxCtGcaBX\r
  57         hHn3glTxABMMXPcroMFMQIP5BdaBDC5JREhJNTBOmVn+X8x0EsP9s7XTtOZ6qE7ldSlRPPx9\r
  58         6o3JdtFXrkmpVKzbwGDW56MYMks4r1rl4KLH+uw71DlPCuyOV5pne5XXvvDYmkUpM670uVxr\r
  59         +MR41sHMI2LelJSLoh/mfZ+223zB403Gr1+z/Pn89PR0103zV7m4B3OcvxIWOn2NoSiHOZvj\r
  60         NE1GJZbijERDLeai4kQA0Nx5Ie0CAAA=\r
  61 Cc: tomi.ollila@iki.fi\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Sun, 13 May 2012 19:57:26 -0000\r
  75 \r
  76 ---\r
  77  bindings/ruby/database.c |   11 ++++++-----\r
  78  1 file changed, 6 insertions(+), 5 deletions(-)\r
  79 \r
  80 diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c\r
  81 index 409d54f..e84f726 100644\r
  82 --- a/bindings/ruby/database.c\r
  83 +++ b/bindings/ruby/database.c\r
  84 @@ -252,6 +252,7 @@ VALUE\r
  85  notmuch_rb_database_get_directory (VALUE self, VALUE pathv)\r
  86  {\r
  87      const char *path;\r
  88 +    notmuch_status_t ret;\r
  89      notmuch_directory_t *dir;\r
  90      notmuch_database_t *db;\r
  91  \r
  92 @@ -260,11 +261,11 @@ notmuch_rb_database_get_directory (VALUE self, VALUE pathv)\r
  93      SafeStringValue (pathv);\r
  94      path = RSTRING_PTR (pathv);\r
  95  \r
  96 -    dir = notmuch_database_get_directory (db, path);\r
  97 -    if (!dir)\r
  98 -        rb_raise (notmuch_rb_eXapianError, "Xapian exception");\r
  99 -\r
 100 -    return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir);\r
 101 +    ret = notmuch_database_get_directory (db, path, &dir);\r
 102 +    notmuch_rb_status_raise (ret);\r
 103 +    if (dir)\r
 104 +       return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir);\r
 105 +    return Qnil;\r
 106  }\r
 107  \r
 108  /*\r
 109 -- \r
 110 1.7.10\r
 111 \r