99/18b08a225b348a0922b0b0939df63a9ac36026

   1 Return-Path: <jani@nikula.org>\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 915F6429E25\r
   6         for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:10 -0800 (PST)\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 QfpgTDleH9GQ for <notmuch@notmuchmail.org>;\r
  16         Thu, 14 Nov 2013 06:14:05 -0800 (PST)\r
  17 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com\r
  18  [74.125.82.48])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  1C5C3431FDC    for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:04 -0800\r
  21  (PST)\r
  22 Received: by mail-wg0-f48.google.com with SMTP id n12so1967626wgh.3\r
  23         for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:14:03 -0800 (PST)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
  27         :user-agent:date:message-id:mime-version:content-type;\r
  28         bh=Zf/DXmwBKAo2Cu6z4wDz1kwNXRuYa3arwLwbIpLuH6o=;\r
  29         b=iV4hWnTa/rH2UhS9SpGsfaKY7HTPbLNxwjrrm2iaa7b8fxPsAwzwi5F7jf5IDDeJ85\r
  30         QxyP9fbntE3cIzEtcZxbkr9KBYg0u7BuYsLqPq5n4wNfxcGK1+u3rHA5SEn7p0Pfqr/r\r
  31         vGNiSoDRKWALgrA1WlhY85dlFU/mqwKaAoTnnYHF/jf+iuSBgW99/T9x6iZ6KUydOOak\r
  32         9cQiXZoTcEXdo1gNjmblBRACijhN8q2YI+3tQU/SKm6wTSadxRTpbBha4yJ3JhXzONgG\r
  33         iCFmWQrYX/4pMrFjtN8sGHmNzNrvR0F8Nr79DuBfMDDC5vt4YJ0EyTsM2H0GZn3ihumE\r
  34         ejbA==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQnDS9n/ypaoKFciodRTiXY9mQGMSnu+yBFpQfLR8IyS1X/HC3k5RCMx50gDRWQXR4CbHer9\r
  37 X-Received: by 10.180.73.9 with SMTP id h9mr2925625wiv.26.1384438443675;\r
  38         Thu, 14 Nov 2013 06:14:03 -0800 (PST)\r
  39 Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
  40         by mx.google.com with ESMTPSA id c10sm861894wie.11.2013.11.14.06.13.59\r
  41         for <multiple recipients>\r
  42         (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
  43         Thu, 14 Nov 2013 06:14:02 -0800 (PST)\r
  44 From: Jani Nikula <jani@nikula.org>\r
  45 To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
  46 Subject: Re: [PATCH v2 2/5] compact: catch Xapian::Error consistently\r
  47 In-Reply-To: <1384362167-12740-3-git-send-email-tomi.ollila@iki.fi>\r
  48 References: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi>\r
  49         <1384362167-12740-3-git-send-email-tomi.ollila@iki.fi>\r
  50 User-Agent: Notmuch/0.16+115~gd647c65 (http://notmuchmail.org) Emacs/23.2.1\r
  51         (x86_64-pc-linux-gnu)\r
  52 Date: Thu, 14 Nov 2013 15:13:41 +0100\r
  53 Message-ID: <87y54rm5pm.fsf@nikula.org>\r
  54 MIME-Version: 1.0\r
  55 Content-Type: text/plain; charset=us-ascii\r
  56 Cc: tomi.ollila@iki.fi\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: Thu, 14 Nov 2013 14:14:10 -0000\r
  70 \r
  71 \r
  72 The first two patches LGTM.\r
  73 \r
  74 On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
  75 > catch Xapian::Error in compact code in lib/database.cc to be consistent\r
  76 > with other code in addition to not making software crash on uncaught\r
  77 > other Xapian error.\r
  78 > ---\r
  79 >  lib/database.cc | 4 ++--\r
  80 >  1 file changed, 2 insertions(+), 2 deletions(-)\r
  81 >\r
  82 > diff --git a/lib/database.cc b/lib/database.cc\r
  83 > index 3c008d6..3530cb6 100644\r
  84 > --- a/lib/database.cc\r
  85 > +++ b/lib/database.cc\r
  86 > @@ -918,8 +918,8 @@ notmuch_database_compact (const char *path,\r
  87 >       compactor.add_source (xapian_path);\r
  88 >       compactor.set_destdir (compact_xapian_path);\r
  89 >       compactor.compact ();\r
  90 > -    } catch (Xapian::InvalidArgumentError e) {\r
  91 > -     fprintf (stderr, "Error while compacting: %s\n", e.get_msg().c_str());\r
  92 > +    } catch (const Xapian::Error &error) {\r
  93 > +     fprintf (stderr, "Error while compacting: %s\n", error.get_msg().c_str());\r
  94 >       ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;\r
  95 >       goto DONE;\r
  96 >      }\r
  97 > -- \r
  98 > 1.8.3.1\r
  99 >\r
 100 > _______________________________________________\r
 101 > notmuch mailing list\r
 102 > notmuch@notmuchmail.org\r
 103 > http://notmuchmail.org/mailman/listinfo/notmuch\r