From: Mark Walters <markwalters1009@gmail.com>
To: Tomi Ollila <tomi.ollila@iki.fi>, Austin Clements <amdragon@mit.edu>,
	notmuch@notmuchmail.org
Subject: Re: [PATCH] lib: Fix endless upgrade problem
In-Reply-To: <m261h63acu.fsf@guru.guru-group.fi>
References: <1409611747-32141-1-git-send-email-amdragon@mit.edu>
	<m261h63acu.fsf@guru.guru-group.fi>
User-Agent: Notmuch/0.15.2+803~ge083086 (http://notmuchmail.org) Emacs/23.4.1
	(x86_64-pc-linux-gnu)
Date: Tue, 02 Sep 2014 07:11:43 +0100
Message-ID: <871truo8kg.fsf@qmul.ac.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Precedence: list


On Tue, 02 Sep 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> On Tue, Sep 02 2014, Austin Clements <amdragon@mit.edu> wrote:
>
>> 48db8c8 introduced a disagreement between when
>> notmuch_database_needs_upgrade returned TRUE and when
>> notmuch_database_upgrade actually performed an upgrade.  As a result,
>> if a database had a version less than 3, but no new features were
>> required, notmuch new would call notmuch_database_upgrade to perform
>> an upgrade, but notmuch_database_upgrade would return immediately
>> without updating the database version.  Hence, the next notmuch new
>> would do the same, and so on.
>>
>> Fix this by ensuring that the upgrade-required logic is identical
>> between the two.
>
> LGTM

and me +1

Mark


>
> Tomi
>
>> ---
>>  lib/database.cc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/database.cc b/lib/database.cc
>> index 5116188..a3a7cd3 100644
>> --- a/lib/database.cc
>> +++ b/lib/database.cc
>> @@ -1222,7 +1222,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
>>      target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;
>>      new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;
>>  
>> -    if (! new_features)
>> +    if (! notmuch_database_needs_upgrade (notmuch))
>>  	return NOTMUCH_STATUS_SUCCESS;
>>  
>>      if (progress_notify) {
>> -- 
>> 2.0.0
>>
>> _______________________________________________
>> notmuch mailing list
>> notmuch@notmuchmail.org
>> http://notmuchmail.org/mailman/listinfo/notmuch
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch