[PATCH] lib: Fix endless upgrade problem

diff --git a/76/e92865a0848cdf42df1eecbdb39572c1090dd9 b/76/e92865a0848cdf42df1eecbdb39572c1090dd9
new file mode 100644 (file)
index 0000000..f0528ca
--- /dev/null
+++ b/76/e92865a0848cdf42df1eecbdb39572c1090dd9
@@ -0,0 +1,105 @@
+Return-Path: <amdragon@mit.edu>\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 33DA7431FD2\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 15:49:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 7swONAzt6tqZ for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Sep 2014 15:49:16 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+       [18.7.68.36])\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 7ACE4431FCB\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 15:49:16 -0700 (PDT)\r
+X-AuditID: 12074424-f79346d000004923-04-5404f7eac4f0\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 6D.80.18723.AE7F4045; Mon,  1 Sep 2014 18:49:14 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s81MnDHZ003884; \r
+       Mon, 1 Sep 2014 18:49:13 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s81MnAtd005214\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 1 Sep 2014 18:49:12 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XOaPO-0008N1-QM; Mon, 01 Sep 2014 18:49:10 -0400\r
+From: Austin Clements <amdragon@mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: Fix endless upgrade problem\r
+Date: Mon,  1 Sep 2014 18:49:07 -0400\r
+Message-Id: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6nrvvqO0uIwbHDahY3WrsZLa7fnMns\r
+       wOTxbNUtZo8th94zBzBFcdmkpOZklqUW6dslcGXsnbiUreAvR8XZe+dYGhi3sncxcnJICJhI\r
+       vH7ynQXCFpO4cG89WxcjF4eQwGwmianf3oAlhAQ2MEp8+8wBYd9mkjh6rAyiaC6jROuOHrBJ\r
+       bAIaEr9vLWYCsUUEpCV23p3NCmIzC1hKXP3aDhYXFjCU2HXsNVicRUBVYlnvZbA4r4CDxOVl\r
+       P1ghrpCTaLjxiW0CI+8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealFuuZ6uZkleqkppZsYwYHh\r
+       orKDsfmQ0iFGAQ5GJR7eB7OYQ4RYE8uKK3MPMUpyMCmJ8op8YwkR4kvKT6nMSCzOiC8qzUkt\r
+       PsQowcGsJMLrdRkox5uSWFmVWpQPk5LmYFES531rbRUsJJCeWJKanZpakFoEk5Xh4FCS4H0O\r
+       MlSwKDU9tSItM6cEIc3EwQkynAdo+HeQGt7igsTc4sx0iPwpRl2OdZ3f+pmEWPLy81KlxHkf\r
+       gRQJgBRllObBzYFF9CtGcaC3hHmfglTxAJMB3KRXQEuYgJZUVDGCLClJREhJNTCqr3Of6rW3\r
+       scB+1YIbZXwN/elMP5YGNWecfhGj9z1dZc6ioJMXhSJ/RjAES9usjt45a80+la1f+vrjGl+F\r
+       6PLfK59ZkFJ3nWly59lKv+75Ap3nBNhYs65PSHq9sSCoQKo8PlSknFsp1jO0ge0cu9iUlPlX\r
+       Z3vumZDu8+rEjG7t32mc7y0i5JVYijMSDbWYi4oTAQvQkOvDAgAA\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: Mon, 01 Sep 2014 22:49:20 -0000\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
+ 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