bb/4dc8937fc7ccd499b258aa6f37b22128c72c52

   1 Return-Path: <jani@nikula.org>\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 2F1F7431FC0\r
   6         for <notmuch@notmuchmail.org>; Mon, 17 Mar 2014 14:31:54 -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: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 Fun51tjKtDub for <notmuch@notmuchmail.org>;\r
  16         Mon, 17 Mar 2014 14:31:46 -0700 (PDT)\r
  17 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com\r
  18  [74.125.83.43])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  42397431FBD    for <notmuch@notmuchmail.org>; Mon, 17 Mar 2014 14:31:46 -0700\r
  21  (PDT)\r
  22 Received: by mail-ee0-f43.google.com with SMTP id e53so4624659eek.2\r
  23         for <notmuch@notmuchmail.org>; Mon, 17 Mar 2014 14:31:44 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:subject:in-reply-to:references\r
  27         :user-agent:date:message-id:mime-version:content-type;\r
  28         bh=7xsJrY/MSH2diqi7AKzeg3AOXZ8oL+bwzX0L765wcB8=;\r
  29         b=TzMHuVBgTK1JxOD/OM+p6yWHvsgyTeYen4E/g0rjzR5E59E7Rsix5Y2WEcaOCE7nVp\r
  30         8h8qVYU+cqcfP7wkfu7Idtfe4J+kcFLFLQl7oIyIWZHeY9Ww8+9T8Q68K2O54OobqN3A\r
  31         sQ9+fO5ajYuL9lbvvx3RQFKwRe0TTXrKUGeXaQERFzSHcBz0Dnlf13u+TQz3JvjpbekZ\r
  32         uso+lH8HkpzM/GuPHukCopuqqPHk0flz5gC+UyPojakSO5PUhonAEmyEEgEtdOm03Hfs\r
  33         U+C7XWRbdoRLCDgTLDxvdduvHPfQa1137yZvjPYFTWVzcX98ZhdgIEdZGOs8bWOrzTy8\r
  34         Vv1w==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQnBh5GAlgO1l+pL4qunLaTdz+79D8hSukwrYgHUf1gmePrfKZ6nJ76o+K4tZgxfRO28HGaO\r
  37 X-Received: by 10.15.44.3 with SMTP id y3mr25913732eev.58.1395091903589;\r
  38         Mon, 17 Mar 2014 14:31:43 -0700 (PDT)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id o7sm29941417eew.25.2014.03.17.14.31.42\r
  42         for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Mon, 17 Mar 2014 14:31:42 -0700 (PDT)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: David Bremner <david@tethera.net>,\r
  47         Jameson Graef Rollins <jrollins@finestructure.net>,\r
  48         Notmuch list <notmuch@notmuchmail.org>\r
  49 Subject: Re: WARNING: database upgrade coming\r
  50 In-Reply-To: <87eh20v7zc.fsf@zancas.localnet>\r
  51 References: <874n37a017.fsf@zancas.localnet>\r
  52         <87txawkam3.fsf@servo.finestructure.net>\r
  53         <87a9cood0l.fsf@nikula.org> <87eh20v7zc.fsf@zancas.localnet>\r
  54 User-Agent: Notmuch/0.17+142~g30045abd801f (http://notmuchmail.org)\r
  55         Emacs/24.3.1 (x86_64-pc-linux-gnu)\r
  56 Date: Mon, 17 Mar 2014 23:31:40 +0200\r
  57 Message-ID: <877g7so6kj.fsf@nikula.org>\r
  58 MIME-Version: 1.0\r
  59 Content-Type: text/plain\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\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: Mon, 17 Mar 2014 21:31:54 -0000\r
  73 \r
  74 On Mon, 17 Mar 2014, David Bremner <david@tethera.net> wrote:\r
  75 > Jani Nikula <jani@nikula.org> writes:\r
  76 >\r
  77 >>\r
  78 >> FWIW it should always be safe to interrupt the upgrade; I know we don't\r
  79 >> inform the user about this.\r
  80 >>\r
  81 >\r
  82 > With that in mind, would it be reasonable/worthwhile to print a 5 second (or so)\r
  83 > countdown before running the upgrade? But then people who run it\r
  84 > non-interactively would still automagically get the upgrade, just 5\r
  85 > seconds later.\r
  86 \r
  87 Something like this? Just insert text that makes sense to the user. ;)\r
  88 \r
  89 Jani.\r
  90 \r
  91 \r
  92 diff --git a/notmuch-new.c b/notmuch-new.c\r
  93 index 82acf695353e..f256a3142eb0 100644\r
  94 --- a/notmuch-new.c\r
  95 +++ b/notmuch-new.c\r
  96 @@ -989,8 +989,11 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  97             return EXIT_FAILURE;\r
  98  \r
  99         if (notmuch_database_needs_upgrade (notmuch)) {\r
 100 -           if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
 101 +           if (add_files_state.verbosity >= VERBOSITY_NORMAL) {\r
 102                 printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n");\r
 103 +               sleep (5);\r
 104 +               printf ("Now really.\n");\r
 105 +           }\r
 106             gettimeofday (&add_files_state.tv_start, NULL);\r
 107             notmuch_database_upgrade (notmuch,\r
 108                                       add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r