Re: [PATCH] lib: Fix endless upgrade problem

diff --git a/37/a891c6fdef93ca62bd9196f73b37afd631647e b/37/a891c6fdef93ca62bd9196f73b37afd631647e
new file mode 100644 (file)
index 0000000..b170938
--- /dev/null
+++ b/37/a891c6fdef93ca62bd9196f73b37afd631647e
@@ -0,0 +1,92 @@
+Return-Path: <tomi.ollila@iki.fi>\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 31F15431FD5\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 21:39:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 BDgYvTXJ1u0t for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Sep 2014 21:39:06 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 84293431FD2\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 21:39:06 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id C70DE100090;\r
+       Tue,  2 Sep 2014 07:38:41 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@mit.edu>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib: Fix endless upgrade problem\r
+In-Reply-To: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
+References: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.18.1+89~g3785a70 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 02 Sep 2014 07:38:41 +0300\r
+Message-ID: <m261h63acu.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Tue, 02 Sep 2014 04:39:14 -0000\r
+\r
+On Tue, Sep 02 2014, Austin Clements <amdragon@mit.edu> wrote:\r
+\r
+> 48db8c8 introduced a disagreement between when\r
+> notmuch_database_needs_upgrade returned TRUE and when\r
+> notmuch_database_upgrade actually performed an upgrade.  As a result,\r
+> if a database had a version less than 3, but no new features were\r
+> required, notmuch new would call notmuch_database_upgrade to perform\r
+> an upgrade, but notmuch_database_upgrade would return immediately\r
+> without updating the database version.  Hence, the next notmuch new\r
+> would do the same, and so on.\r
+>\r
+> Fix this by ensuring that the upgrade-required logic is identical\r
+> between the two.\r
+\r
+LGTM\r
+\r
+Tomi\r
+\r
+> ---\r
+>  lib/database.cc | 2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 5116188..a3a7cd3 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -1222,7 +1222,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+>      target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;\r
+>      new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;\r
+>  \r
+> -    if (! new_features)\r
+> +    if (! notmuch_database_needs_upgrade (notmuch))\r
+>      return NOTMUCH_STATUS_SUCCESS;\r
+>  \r
+>      if (progress_notify) {\r
+> -- \r
+> 2.0.0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r