76/e92865a0848cdf42df1eecbdb39572c1090dd9

   1 Return-Path: <amdragon@mit.edu>\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 33DA7431FD2\r
   6         for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 15:49:20 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 7swONAzt6tqZ for <notmuch@notmuchmail.org>;\r
  16         Mon,  1 Sep 2014 15:49:16 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
  18         [18.7.68.36])\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 7ACE4431FCB\r
  22         for <notmuch@notmuchmail.org>; Mon,  1 Sep 2014 15:49:16 -0700 (PDT)\r
  23 X-AuditID: 12074424-f79346d000004923-04-5404f7eac4f0\r
  24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 6D.80.18723.AE7F4045; Mon,  1 Sep 2014 18:49:14 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s81MnDHZ003884; \r
  31         Mon, 1 Sep 2014 18:49:13 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s81MnAtd005214\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Mon, 1 Sep 2014 18:49:12 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1XOaPO-0008N1-QM; Mon, 01 Sep 2014 18:49:10 -0400\r
  42 From: Austin Clements <amdragon@mit.edu>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH] lib: Fix endless upgrade problem\r
  45 Date: Mon,  1 Sep 2014 18:49:07 -0400\r
  46 Message-Id: <1409611747-32141-1-git-send-email-amdragon@mit.edu>\r
  47 X-Mailer: git-send-email 2.0.0\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6nrvvqO0uIwbHDahY3WrsZLa7fnMns\r
  50         wOTxbNUtZo8th94zBzBFcdmkpOZklqUW6dslcGXsnbiUreAvR8XZe+dYGhi3sncxcnJICJhI\r
  51         vH7ynQXCFpO4cG89WxcjF4eQwGwmianf3oAlhAQ2MEp8+8wBYd9mkjh6rAyiaC6jROuOHrBJ\r
  52         bAIaEr9vLWYCsUUEpCV23p3NCmIzC1hKXP3aDhYXFjCU2HXsNVicRUBVYlnvZbA4r4CDxOVl\r
  53         P1ghrpCTaLjxiW0CI+8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealFuuZ6uZkleqkppZsYwYHh\r
  54         orKDsfmQ0iFGAQ5GJR7eB7OYQ4RYE8uKK3MPMUpyMCmJ8op8YwkR4kvKT6nMSCzOiC8qzUkt\r
  55         PsQowcGsJMLrdRkox5uSWFmVWpQPk5LmYFES531rbRUsJJCeWJKanZpakFoEk5Xh4FCS4H0O\r
  56         MlSwKDU9tSItM6cEIc3EwQkynAdo+HeQGt7igsTc4sx0iPwpRl2OdZ3f+pmEWPLy81KlxHkf\r
  57         gRQJgBRllObBzYFF9CtGcaC3hHmfglTxAJMB3KRXQEuYgJZUVDGCLClJREhJNTCqr3Of6rW3\r
  58         scB+1YIbZXwN/elMP5YGNWecfhGj9z1dZc6ioJMXhSJ/RjAES9usjt45a80+la1f+vrjGl+F\r
  59         6PLfK59ZkFJ3nWly59lKv+75Ap3nBNhYs65PSHq9sSCoQKo8PlSknFsp1jO0ge0cu9iUlPlX\r
  60         Z3vumZDu8+rEjG7t32mc7y0i5JVYijMSDbWYi4oTAQvQkOvDAgAA\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Mon, 01 Sep 2014 22:49:20 -0000\r
  74 \r
  75 48db8c8 introduced a disagreement between when\r
  76 notmuch_database_needs_upgrade returned TRUE and when\r
  77 notmuch_database_upgrade actually performed an upgrade.  As a result,\r
  78 if a database had a version less than 3, but no new features were\r
  79 required, notmuch new would call notmuch_database_upgrade to perform\r
  80 an upgrade, but notmuch_database_upgrade would return immediately\r
  81 without updating the database version.  Hence, the next notmuch new\r
  82 would do the same, and so on.\r
  83 \r
  84 Fix this by ensuring that the upgrade-required logic is identical\r
  85 between the two.\r
  86 ---\r
  87  lib/database.cc | 2 +-\r
  88  1 file changed, 1 insertion(+), 1 deletion(-)\r
  89 \r
  90 diff --git a/lib/database.cc b/lib/database.cc\r
  91 index 5116188..a3a7cd3 100644\r
  92 --- a/lib/database.cc\r
  93 +++ b/lib/database.cc\r
  94 @@ -1222,7 +1222,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
  95      target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;\r
  96      new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;\r
  97  \r
  98 -    if (! new_features)\r
  99 +    if (! notmuch_database_needs_upgrade (notmuch))\r
 100         return NOTMUCH_STATUS_SUCCESS;\r
 101  \r
 102      if (progress_notify) {\r
 103 -- \r
 104 2.0.0\r
 105 \r