Re: [PATCH] lib: Fix endless upgrade problem

diff --git a/08/6f81e81df973a435e6130eaff0827f9f2edaa2 b/08/6f81e81df973a435e6130eaff0827f9f2edaa2
new file mode 100644 (file)
index 0000000..d7f7e44
--- /dev/null
+++ b/08/6f81e81df973a435e6130eaff0827f9f2edaa2
@@ -0,0 +1,127 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 0A06E431FD7\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 23:12:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.502\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.502 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, 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 yti6xLkKhGEY for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Sep 2014 23:12:10 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 26751431FD2\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 23:12:10 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1XOhJh-0003V4-19; Tue, 02 Sep 2014 07:12:05 +0100\r
+Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1XOhJg-00075s-Eq; Tue, 02 Sep 2014 07:11:44 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, Austin Clements <amdragon@mit.edu>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib: Fix endless upgrade problem\r
+In-Reply-To: <m261h63acu.fsf@guru.guru-group.fi>\r
+References: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
+       <m261h63acu.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.15.2+803~ge083086 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 02 Sep 2014 07:11:43 +0100\r
+Message-ID: <871truo8kg.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 87.81.223.162\r
+X-QM-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: d30a5159a6dcb1db78ef6ad8e3abd159 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -0.1 points.\r
+       Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 06:12:18 -0000\r
+\r
+\r
+On Tue, 02 Sep 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:\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
+and me +1\r
+\r
+Mark\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r