Re: [PATCH] lib: Fix endless upgrade problem

diff --git a/56/80d3e4d5b1a389eb69a6a83bd05a145433ec58 b/56/80d3e4d5b1a389eb69a6a83bd05a145433ec58
new file mode 100644 (file)
index 0000000..48ff778
--- /dev/null
+++ b/56/80d3e4d5b1a389eb69a6a83bd05a145433ec58
@@ -0,0 +1,68 @@
+Return-Path: <david@tethera.net>\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 76B32431FD8\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 23:15:28 -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 3tvwLL+0J75I for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Sep 2014 23:15:23 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C1FB0431FD2\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 23:15:23 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1XOhNA-0005W2-66; Tue, 02 Sep 2014 03:15:20 -0300\r
+Received: (nullmailer pid 20558 invoked by uid 1000); Tue, 02 Sep 2014\r
+       06:15:13 -0000\r
+From: David Bremner <david@tethera.net>\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+85~gcca05ac (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 01 Sep 2014 23:15:13 -0700\r
+Message-ID: <87sika7dla.fsf@maritornes.cs.unb.ca>\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 06:15:28 -0000\r
+\r
+Austin Clements <amdragon@mit.edu> writes:\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
+\r
+Thanks for the quick fix.\r
+\r
+pushed,\r
+\r
+d\r