From: Austin Clements Date: Sun, 13 May 2012 19:57:08 +0000 (+2000) Subject: [PATCH 4/5] ruby: Update for changes to notmuch_database_get_directory X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=478980a73813be81bd2b175be551b5f46a513f6d;p=notmuch-archives.git [PATCH 4/5] ruby: Update for changes to notmuch_database_get_directory --- diff --git a/ac/0c699d1aab1ca6a105b3d4a31659f44ecbc312 b/ac/0c699d1aab1ca6a105b3d4a31659f44ecbc312 new file mode 100644 index 000000000..08d2e0413 --- /dev/null +++ b/ac/0c699d1aab1ca6a105b3d4a31659f44ecbc312 @@ -0,0 +1,111 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CFD96431FD0 + for ; Sun, 13 May 2012 12:57:25 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id kMhWeqHPbJkj for ; + Sun, 13 May 2012 12:57:24 -0700 (PDT) +Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id 2C6A4431FC4 + for ; Sun, 13 May 2012 12:57:23 -0700 (PDT) +X-AuditID: 1209190e-b7fd86d0000008b4-21-4fb01221e225 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 6A.0C.02228.12210BF4; Sun, 13 May 2012 15:57:21 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4DJvKmk007435; + Sun, 13 May 2012 15:57:20 -0400 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4DJvGEk022911 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 13 May 2012 15:57:17 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1STeuq-0003ew-2D; Sun, 13 May 2012 15:57:16 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 4/5] ruby: Update for changes to + notmuch_database_get_directory +Date: Sun, 13 May 2012 15:57:08 -0400 +Message-Id: <1336939029-13969-5-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1336939029-13969-1-git-send-email-amdragon@mit.edu> +References: <1336939029-13969-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsUixCmqrKsotMHf4MFMA4vZrT+YLG60djNa + NE13trh+cyazxZuV81gdWD0Of13I4jHx/Gk2j1v3X7N7PFt1i9ljy6H3zAGsUVw2Kak5mWWp + Rfp2CVwZ+8+eYi5YyVEx/aZOA+MFti5GTg4JAROJxo0tULaYxIV764FsLg4hgX2MEtc/HGeC + cDYwSvT8nMUK4dxnkrg/aQVUZj6jxI3bxxlB+tkENCS27V8OZosISEvsvDsbrINZoItR4veb + ZmaQhLCAv8Sco9eBijg4WARUJQ5PUQcJ8wo4SCx8MJcd4g55iaf3+8Bu4hRwlFh2ZSFYqxBQ + zcmPf5knMPIvYGRYxSibklulm5uYmVOcmqxbnJyYl5dapGusl5tZopeaUrqJERyEknw7GL8e + VDrEKMDBqMTDu0B0vb8Qa2JZcWXuIUZJDiYlUd40wQ3+QnxJ+SmVGYnFGfFFpTmpxYcYJTiY + lUR41z8EKudNSaysSi3Kh0lJc7AoifOqab3zExJITyxJzU5NLUgtgsnKcHAoSfAaggwVLEpN + T61Iy8wpQUgzcXCCDOcBGp4CUsNbXJCYW5yZDpE/xagoJc5rAJIQAElklObB9cKSxCtGcaBX + hHn3glTxABMMXPcroMFMQIP5BdaBDC5JREhJNTBOmVn+X8x0EsP9s7XTtOZ6qE7ldSlRPPx9 + 6o3JdtFXrkmpVKzbwGDW56MYMks4r1rl4KLH+uw71DlPCuyOV5pne5XXvvDYmkUpM670uVxr + +MR41sHMI2LelJSLoh/mfZ+223zB403Gr1+z/Pn89PR0103zV7m4B3OcvxIWOn2NoSiHOZvj + NE1GJZbijERDLeai4kQA0Nx5Ie0CAAA= +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 13 May 2012 19:57:26 -0000 + +--- + bindings/ruby/database.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c +index 409d54f..e84f726 100644 +--- a/bindings/ruby/database.c ++++ b/bindings/ruby/database.c +@@ -252,6 +252,7 @@ VALUE + notmuch_rb_database_get_directory (VALUE self, VALUE pathv) + { + const char *path; ++ notmuch_status_t ret; + notmuch_directory_t *dir; + notmuch_database_t *db; + +@@ -260,11 +261,11 @@ notmuch_rb_database_get_directory (VALUE self, VALUE pathv) + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); + +- dir = notmuch_database_get_directory (db, path); +- if (!dir) +- rb_raise (notmuch_rb_eXapianError, "Xapian exception"); +- +- return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir); ++ ret = notmuch_database_get_directory (db, path, &dir); ++ notmuch_rb_status_raise (ret); ++ if (dir) ++ return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir); ++ return Qnil; + } + + /* +-- +1.7.10 +