1 Return-Path: <m.walters@qmul.ac.uk>
\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 0A06E431FD7
\r
6 for <notmuch@notmuchmail.org>; Mon, 1 Sep 2014 23:12:18 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.502 tagged_above=-999 required=5
\r
12 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,
\r
13 NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id yti6xLkKhGEY for <notmuch@notmuchmail.org>;
\r
17 Mon, 1 Sep 2014 23:12:10 -0700 (PDT)
\r
18 Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 26751431FD2
\r
22 for <notmuch@notmuchmail.org>; Mon, 1 Sep 2014 23:12:10 -0700 (PDT)
\r
23 Received: from smtp.qmul.ac.uk ([138.37.6.40])
\r
24 by mail2.qmul.ac.uk with esmtp (Exim 4.71)
\r
25 (envelope-from <m.walters@qmul.ac.uk>)
\r
26 id 1XOhJh-0003V4-19; Tue, 02 Sep 2014 07:12:05 +0100
\r
27 Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)
\r
28 by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)
\r
29 (envelope-from <m.walters@qmul.ac.uk>)
\r
30 id 1XOhJg-00075s-Eq; Tue, 02 Sep 2014 07:11:44 +0100
\r
31 From: Mark Walters <markwalters1009@gmail.com>
\r
32 To: Tomi Ollila <tomi.ollila@iki.fi>, Austin Clements <amdragon@mit.edu>,
\r
33 notmuch@notmuchmail.org
\r
34 Subject: Re: [PATCH] lib: Fix endless upgrade problem
\r
35 In-Reply-To: <m261h63acu.fsf@guru.guru-group.fi>
\r
36 References: <1409611747-32141-1-git-send-email-amdragon@mit.edu>
\r
37 <m261h63acu.fsf@guru.guru-group.fi>
\r
38 User-Agent: Notmuch/0.15.2+803~ge083086 (http://notmuchmail.org) Emacs/23.4.1
\r
39 (x86_64-pc-linux-gnu)
\r
40 Date: Tue, 02 Sep 2014 07:11:43 +0100
\r
41 Message-ID: <871truo8kg.fsf@qmul.ac.uk>
\r
43 Content-Type: text/plain; charset=us-ascii
\r
44 X-Sender-Host-Address: 87.81.223.162
\r
45 X-QM-Geographic: According to ripencc,
\r
46 this message was delivered by a machine in Britain (UK) (GB).
\r
47 X-QM-SPAM-Info: Sender has good ham record. :)
\r
48 X-QM-Body-MD5: d30a5159a6dcb1db78ef6ad8e3abd159 (of first 20000 bytes)
\r
49 X-SpamAssassin-Score: -0.1
\r
50 X-SpamAssassin-SpamBar: /
\r
51 X-SpamAssassin-Report: The QM spam filters have analysed this message to
\r
53 spam. We require at least 5.0 points to mark a message as spam.
\r
54 This message scored -0.1 points.
\r
55 Summary of the scoring:
\r
56 * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
\r
57 provider * (markwalters1009[at]gmail.com)
\r
58 * -0.1 AWL AWL: From: address is in the auto white-list
\r
59 X-QM-Scan-Virus: ClamAV says the message is clean
\r
60 X-BeenThere: notmuch@notmuchmail.org
\r
61 X-Mailman-Version: 2.1.13
\r
63 List-Id: "Use and development of the notmuch mail system."
\r
64 <notmuch.notmuchmail.org>
\r
65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
68 List-Post: <mailto:notmuch@notmuchmail.org>
\r
69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
72 X-List-Received-Date: Tue, 02 Sep 2014 06:12:18 -0000
\r
75 On Tue, 02 Sep 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:
\r
76 > On Tue, Sep 02 2014, Austin Clements <amdragon@mit.edu> wrote:
\r
78 >> 48db8c8 introduced a disagreement between when
\r
79 >> notmuch_database_needs_upgrade returned TRUE and when
\r
80 >> notmuch_database_upgrade actually performed an upgrade. As a result,
\r
81 >> if a database had a version less than 3, but no new features were
\r
82 >> required, notmuch new would call notmuch_database_upgrade to perform
\r
83 >> an upgrade, but notmuch_database_upgrade would return immediately
\r
84 >> without updating the database version. Hence, the next notmuch new
\r
85 >> would do the same, and so on.
\r
87 >> Fix this by ensuring that the upgrade-required logic is identical
\r
101 >> lib/database.cc | 2 +-
\r
102 >> 1 file changed, 1 insertion(+), 1 deletion(-)
\r
104 >> diff --git a/lib/database.cc b/lib/database.cc
\r
105 >> index 5116188..a3a7cd3 100644
\r
106 >> --- a/lib/database.cc
\r
107 >> +++ b/lib/database.cc
\r
108 >> @@ -1222,7 +1222,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
\r
109 >> target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;
\r
110 >> new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;
\r
112 >> - if (! new_features)
\r
113 >> + if (! notmuch_database_needs_upgrade (notmuch))
\r
114 >> return NOTMUCH_STATUS_SUCCESS;
\r
116 >> if (progress_notify) {
\r
120 >> _______________________________________________
\r
121 >> notmuch mailing list
\r
122 >> notmuch@notmuchmail.org
\r
123 >> http://notmuchmail.org/mailman/listinfo/notmuch
\r
124 > _______________________________________________
\r
125 > notmuch mailing list
\r
126 > notmuch@notmuchmail.org
\r
127 > http://notmuchmail.org/mailman/listinfo/notmuch
\r