Re: [PATCH v2 2/5] compact: catch Xapian::Error consistently

diff --git a/99/18b08a225b348a0922b0b0939df63a9ac36026 b/99/18b08a225b348a0922b0b0939df63a9ac36026
new file mode 100644 (file)
index 0000000..2a1b696
--- /dev/null
+++ b/99/18b08a225b348a0922b0b0939df63a9ac36026
@@ -0,0 +1,103 @@
+Return-Path: <jani@nikula.org>\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 915F6429E25\r
+       for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:10 -0800 (PST)\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 QfpgTDleH9GQ for <notmuch@notmuchmail.org>;\r
+       Thu, 14 Nov 2013 06:14:05 -0800 (PST)\r
+Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com\r
+ [74.125.82.48])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 1C5C3431FDC   for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:04 -0800\r
+ (PST)\r
+Received: by mail-wg0-f48.google.com with SMTP id n12so1967626wgh.3\r
+       for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:03 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=Zf/DXmwBKAo2Cu6z4wDz1kwNXRuYa3arwLwbIpLuH6o=;\r
+       b=iV4hWnTa/rH2UhS9SpGsfaKY7HTPbLNxwjrrm2iaa7b8fxPsAwzwi5F7jf5IDDeJ85\r
+       QxyP9fbntE3cIzEtcZxbkr9KBYg0u7BuYsLqPq5n4wNfxcGK1+u3rHA5SEn7p0Pfqr/r\r
+       vGNiSoDRKWALgrA1WlhY85dlFU/mqwKaAoTnnYHF/jf+iuSBgW99/T9x6iZ6KUydOOak\r
+       9cQiXZoTcEXdo1gNjmblBRACijhN8q2YI+3tQU/SKm6wTSadxRTpbBha4yJ3JhXzONgG\r
+       iCFmWQrYX/4pMrFjtN8sGHmNzNrvR0F8Nr79DuBfMDDC5vt4YJ0EyTsM2H0GZn3ihumE\r
+       ejbA==\r
+X-Gm-Message-State:\r
+ ALoCoQnDS9n/ypaoKFciodRTiXY9mQGMSnu+yBFpQfLR8IyS1X/HC3k5RCMx50gDRWQXR4CbHer9\r
+X-Received: by 10.180.73.9 with SMTP id h9mr2925625wiv.26.1384438443675;\r
+       Thu, 14 Nov 2013 06:14:03 -0800 (PST)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id c10sm861894wie.11.2013.11.14.06.13.59\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Thu, 14 Nov 2013 06:14:02 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 2/5] compact: catch Xapian::Error consistently\r
+In-Reply-To: <1384362167-12740-3-git-send-email-tomi.ollila@iki.fi>\r
+References: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi>\r
+       <1384362167-12740-3-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.16+115~gd647c65 (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 14 Nov 2013 15:13:41 +0100\r
+Message-ID: <87y54rm5pm.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Cc: tomi.ollila@iki.fi\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: Thu, 14 Nov 2013 14:14:10 -0000\r
+\r
+\r
+The first two patches LGTM.\r
+\r
+On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> catch Xapian::Error in compact code in lib/database.cc to be consistent\r
+> with other code in addition to not making software crash on uncaught\r
+> other Xapian error.\r
+> ---\r
+>  lib/database.cc | 4 ++--\r
+>  1 file changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 3c008d6..3530cb6 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -918,8 +918,8 @@ notmuch_database_compact (const char *path,\r
+>      compactor.add_source (xapian_path);\r
+>      compactor.set_destdir (compact_xapian_path);\r
+>      compactor.compact ();\r
+> -    } catch (Xapian::InvalidArgumentError e) {\r
+> -    fprintf (stderr, "Error while compacting: %s\n", e.get_msg().c_str());\r
+> +    } catch (const Xapian::Error &error) {\r
+> +    fprintf (stderr, "Error while compacting: %s\n", error.get_msg().c_str());\r
+>      ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;\r
+>      goto DONE;\r
+>      }\r
+> -- \r
+> 1.8.3.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r