On Tue, Aug 05 2014, Austin Clements <amdragon at MIT.EDU> wrote:
> Previously the return status of notmuch_database_upgrade went
> completely unchecked.
> ---
LGTM.
Tomi
> notmuch-new.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/notmuch-new.c b/notmuch-new.c
> index b7590a8..ddf42c1 100644
> --- a/notmuch-new.c
> +++ b/notmuch-new.c
> @@ -923,6 +923,7 @@ notmuch_new_command (notmuch_config_t *config, int argc,
> char *argv[])
> notmuch_bool_t timer_is_active = FALSE;
> notmuch_bool_t no_hooks = FALSE;
> notmuch_bool_t quiet = FALSE, verbose = FALSE;
> + notmuch_status_t status;
>
> add_files_state.verbosity = VERBOSITY_NORMAL;
> add_files_state.debug = FALSE;
> @@ -1019,9 +1020,16 @@ notmuch_new_command (notmuch_config_t *config, int
> argc, char *argv[])
> }
>
> gettimeofday (&add_files_state.tv_start, NULL);
> - notmuch_database_upgrade (notmuch,
> - add_files_state.verbosity >=
> VERBOSITY_NORMAL ? upgrade_print_progress : NULL,
> - &add_files_state);
> + status = notmuch_database_upgrade (
> + notmuch,
> + add_files_state.verbosity >= VERBOSITY_NORMAL ?
> upgrade_print_progress : NULL,
> + &add_files_state);
> + if (status) {
> + printf ("Upgrade failed: %s\n",
> + notmuch_status_to_string (status));
> + notmuch_database_destroy (notmuch);
> + return EXIT_FAILURE;
> + }
> if (add_files_state.verbosity >= VERBOSITY_NORMAL)
> printf ("Your notmuch database has now been upgraded.\n");
> }
> @@ -1090,7 +1098,6 @@ notmuch_new_command (notmuch_config_t *config, int
> argc, char *argv[])
> }
>
> for (f = add_files_state.directory_mtimes->head; f && !interrupted; f =
> f->next) {
> - notmuch_status_t status;
> notmuch_directory_t *directory;
> status = notmuch_database_get_directory (notmuch, f->filename,
> &directory);
> if (status == NOTMUCH_STATUS_SUCCESS && directory) {
> --
> 2.0.0
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
