40/7530c592391bb063c072ecae1b4f6a2a34eab1

   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 2F464431FBC\r
   6         for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:49:19 -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 Tim-1SPG9S2w for <notmuch@notmuchmail.org>;\r
  16         Tue, 29 Jul 2014 09:49:13 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
  18         [18.9.25.12])\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 9A7CD431FDB\r
  22         for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:31 -0700 (PDT)\r
  23 X-AuditID: 1209190c-f79ef6d000005dd6-6e-53d7d05ccac7\r
  24 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\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-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id C6.EC.24022.D50D7D35; Tue, 29 Jul 2014 12:48:29 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmI5t003474; \r
  31         Tue, 29 Jul 2014 12:48:18 -0400\r
  32 Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
  33         [128.31.33.71]) (authenticated bits=0)\r
  34         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  35         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmF9o030250\r
  36         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  37         Tue, 29 Jul 2014 12:48:17 -0400\r
  38 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  39         (envelope-from <amdragon@mit.edu>)\r
  40         id 1XCAZS-0007Gk-P2; Tue, 29 Jul 2014 12:48:14 -0400\r
  41 From: Austin Clements <amdragon@MIT.EDU>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH v2 04/14] new: Don't report version after upgrade\r
  44 Date: Tue, 29 Jul 2014 12:48:02 -0400\r
  45 Message-Id: <1406652492-27803-5-git-send-email-amdragon@mit.edu>\r
  46 X-Mailer: git-send-email 2.0.0\r
  47 In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
  48 References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
  49 X-Brightmail-Tracker:\r
  50  H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrBt74XqwwftmVovVc3ksrt+cyezA\r
  51         5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZWxcIVXQzVfx9dUN9gbGbdxdjJwcEgImEhPu\r
  52         P2GFsMUkLtxbz9bFyMUhJDCbSeLXic/MEM5GRomvhy4xQTjHmCTOrmpkhHDmMko867vGBtLP\r
  53         JqAhsW3/ckYQW0RAWmLn3dlgc5kFHCU+718EVMPBIQxk7/zBBBJmEVCV+Hv9EFgrr4CDxLlD\r
  54         W6DOkJNouPEJLM4JVH7r3l2weiGgmkOzNrNMYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1\r
  55         SNdQLzezRC81pXQTIziMJHl2ML45qHSIUYCDUYmHd8Pca8FCrIllxZW5hxglOZiURHn19l0P\r
  56         FuJLyk+pzEgszogvKs1JLT7EKMHBrCTCy3cWKMebklhZlVqUD5OS5mBREud9a20VLCSQnliS\r
  57         mp2aWpBaBJOV4eBQkuA1Og/UKFiUmp5akZaZU4KQZuLgBBnOAzS8GaSGt7ggMbc4Mx0if4pR\r
  58         UUqcN/scUEIAJJFRmgfXC4vzV4ziQK8I87qDtPMAUwRc9yugwUxAg1ldwAaXJCKkpBoYlVW0\r
  59         Gtg+eFw+tz3QYHJFT4fe/ZisBxOZd9/8JnblGmf4ruuXzumGrf8/8YTi5mu8/1Ri9C6vj+p8\r
  60         VPOy/O3c1oWMFSW1Da7yZz+f8KrZEMOS+1Y/TJ2v0qZU9PSbHp6+yCVGF/Z49xoVT5djKZ7H\r
  61         pGWubf70Aaef69crao+lxPjnRPJxRfAqsRRnJBpqMRcVJwIA8o7ogs4CAAA=\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Tue, 29 Jul 2014 16:49:19 -0000\r
  75 \r
  76 The version number has always been pretty meaningless to the user and\r
  77 it's about to become even more meaningless with the introduction of\r
  78 "features".  Hopefully, the database will remain on version 3 for some\r
  79 time to come; however, the introduction of new features over time in\r
  80 version 3 will necessitate upgrades within version 3.  It would be\r
  81 confusing if we always tell the user they've been "upgraded to version\r
  82 3".  If the user wants to know what's new, they should read the news.\r
  83 ---\r
  84  notmuch-new.c        | 3 +--\r
  85  test/T530-upgrade.sh | 2 +-\r
  86  2 files changed, 2 insertions(+), 3 deletions(-)\r
  87 \r
  88 diff --git a/notmuch-new.c b/notmuch-new.c\r
  89 index d269c7c..b7590a8 100644\r
  90 --- a/notmuch-new.c\r
  91 +++ b/notmuch-new.c\r
  92 @@ -1023,8 +1023,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  93                                       add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
  94                                       &add_files_state);\r
  95             if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
  96 -               printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
  97 -                   notmuch_database_get_version (notmuch));\r
  98 +               printf ("Your notmuch database has now been upgraded.\n");\r
  99         }\r
 100  \r
 101         add_files_state.total_files = 0;\r
 102 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 103 index 7d5d5aa..c4c4ac8 100755\r
 104 --- a/test/T530-upgrade.sh\r
 105 +++ b/test/T530-upgrade.sh\r
 106 @@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
 107  Welcome to a new version of notmuch! Your database will now be upgraded.\r
 108  This process is safe to interrupt.\r
 109  Backing up tags to FILENAME\r
 110 -Your notmuch database has now been upgraded to database format version 2.\r
 111 +Your notmuch database has now been upgraded.\r
 112  No new mail."\r
 113  \r
 114  test_begin_subtest "tag backup matches pre-upgrade dump"\r
 115 -- \r
 116 2.0.0\r
 117 \r