37/a891c6fdef93ca62bd9196f73b37afd631647e

   1 Return-Path: <tomi.ollila@iki.fi>\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 31F15431FD5\r
   6         for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 21:39:14 -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\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         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 BDgYvTXJ1u0t for <notmuch@notmuchmail.org>;\r
  16         Mon,  1 Sep 2014 21:39:06 -0700 (PDT)\r
  17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
  18         by olra.theworths.org (Postfix) with ESMTP id 84293431FD2\r
  19         for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 21:39:06 -0700 (PDT)\r
  20 Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
  21         by guru.guru-group.fi (Postfix) with ESMTP id C70DE100090;\r
  22         Tue,  2 Sep 2014 07:38:41 +0300 (EEST)\r
  23 From: Tomi Ollila <tomi.ollila@iki.fi>\r
  24 To: Austin Clements <amdragon@mit.edu>, notmuch@notmuchmail.org\r
  25 Subject: Re: [PATCH] lib: Fix endless upgrade problem\r
  26 In-Reply-To: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
  27 References: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
  28 User-Agent: Notmuch/0.18.1+89~g3785a70 (http://notmuchmail.org) Emacs/24.3.1\r
  29         (x86_64-unknown-linux-gnu)\r
  30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
  31         $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
  32         !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
  33 Date: Tue, 02 Sep 2014 07:38:41 +0300\r
  34 Message-ID: <m261h63acu.fsf@guru.guru-group.fi>\r
  35 MIME-Version: 1.0\r
  36 Content-Type: text/plain\r
  37 X-BeenThere: notmuch@notmuchmail.org\r
  38 X-Mailman-Version: 2.1.13\r
  39 Precedence: list\r
  40 List-Id: "Use and development of the notmuch mail system."\r
  41         <notmuch.notmuchmail.org>\r
  42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  43         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  45 List-Post: <mailto:notmuch@notmuchmail.org>\r
  46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  48         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  49 X-List-Received-Date: Tue, 02 Sep 2014 04:39:14 -0000\r
  50 \r
  51 On Tue, Sep 02 2014, Austin Clements <amdragon@mit.edu> wrote:\r
  52 \r
  53 > 48db8c8 introduced a disagreement between when\r
  54 > notmuch_database_needs_upgrade returned TRUE and when\r
  55 > notmuch_database_upgrade actually performed an upgrade.  As a result,\r
  56 > if a database had a version less than 3, but no new features were\r
  57 > required, notmuch new would call notmuch_database_upgrade to perform\r
  58 > an upgrade, but notmuch_database_upgrade would return immediately\r
  59 > without updating the database version.  Hence, the next notmuch new\r
  60 > would do the same, and so on.\r
  61 >\r
  62 > Fix this by ensuring that the upgrade-required logic is identical\r
  63 > between the two.\r
  64 \r
  65 LGTM\r
  66 \r
  67 Tomi\r
  68 \r
  69 > ---\r
  70 >  lib/database.cc | 2 +-\r
  71 >  1 file changed, 1 insertion(+), 1 deletion(-)\r
  72 >\r
  73 > diff --git a/lib/database.cc b/lib/database.cc\r
  74 > index 5116188..a3a7cd3 100644\r
  75 > --- a/lib/database.cc\r
  76 > +++ b/lib/database.cc\r
  77 > @@ -1222,7 +1222,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
  78 >      target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;\r
  79 >      new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;\r
  80 >  \r
  81 > -    if (! new_features)\r
  82 > +    if (! notmuch_database_needs_upgrade (notmuch))\r
  83 >       return NOTMUCH_STATUS_SUCCESS;\r
  84 >  \r
  85 >      if (progress_notify) {\r
  86 > -- \r
  87 > 2.0.0\r
  88 >\r
  89 > _______________________________________________\r
  90 > notmuch mailing list\r
  91 > notmuch@notmuchmail.org\r
  92 > http://notmuchmail.org/mailman/listinfo/notmuch\r