Re: [PATCH] new: Report and abort on upgrade failure

diff --git a/93/609e473e5f95dd685ada43ec3acb759ffad2e0 b/93/609e473e5f95dd685ada43ec3acb759ffad2e0
new file mode 100644 (file)
index 0000000..23958c4
--- /dev/null
+++ b/93/609e473e5f95dd685ada43ec3acb759ffad2e0
@@ -0,0 +1,111 @@
+Return-Path: <tomi.ollila@iki.fi>\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 18EC9431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 00:24:00 -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 hBmI7itpaxKB for <notmuch@notmuchmail.org>;\r
+       Tue,  5 Aug 2014 00:23:52 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id B2403431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 00:23:52 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 4016C100051;\r
+       Tue,  5 Aug 2014 10:23:42 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] new: Report and abort on upgrade failure\r
+In-Reply-To: <1407202186-3968-1-git-send-email-amdragon@mit.edu>\r
+References: <1407202186-3968-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.18.1+25~gdaf4b6f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 05 Aug 2014 10:23:42 +0300\r
+Message-ID: <m2wqan4cxt.fsf@guru.guru-group.fi>\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, 05 Aug 2014 07:24:00 -0000\r
+\r
+On Tue, Aug 05 2014, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Previously the return status of notmuch_database_upgrade went\r
+> completely unchecked.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>  notmuch-new.c | 15 +++++++++++----\r
+>  1 file changed, 11 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index b7590a8..ddf42c1 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -923,6 +923,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+>      notmuch_bool_t timer_is_active = FALSE;\r
+>      notmuch_bool_t no_hooks = FALSE;\r
+>      notmuch_bool_t quiet = FALSE, verbose = FALSE;\r
+> +    notmuch_status_t status;\r
+>  \r
+>      add_files_state.verbosity = VERBOSITY_NORMAL;\r
+>      add_files_state.debug = FALSE;\r
+> @@ -1019,9 +1020,16 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+>          }\r
+>  \r
+>          gettimeofday (&add_files_state.tv_start, NULL);\r
+> -        notmuch_database_upgrade (notmuch,\r
+> -                                  add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
+> -                                  &add_files_state);\r
+> +        status = notmuch_database_upgrade (\r
+> +            notmuch,\r
+> +            add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
+> +            &add_files_state);\r
+> +        if (status) {\r
+> +            printf ("Upgrade failed: %s\n",\r
+> +                    notmuch_status_to_string (status));\r
+> +            notmuch_database_destroy (notmuch);\r
+> +            return EXIT_FAILURE;\r
+> +        }\r
+>          if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
+>              printf ("Your notmuch database has now been upgraded.\n");\r
+>      }\r
+> @@ -1090,7 +1098,6 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+>      }\r
+>  \r
+>      for (f = add_files_state.directory_mtimes->head; f && !interrupted; f = f->next) {\r
+> -    notmuch_status_t status;\r
+>      notmuch_directory_t *directory;\r
+>      status = notmuch_database_get_directory (notmuch, f->filename, &directory);\r
+>      if (status == NOTMUCH_STATUS_SUCCESS && directory) {\r
+> -- \r
+> 2.0.0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r