32/27291261e42f6a731696ce56e51eb0ae69221b

   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 166DE431FC0\r
   6         for <notmuch@notmuchmail.org>; Mon,  4 Aug 2014 18:29:59 -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 TcLH537UmaUV for <notmuch@notmuchmail.org>;\r
  16         Mon,  4 Aug 2014 18:29:53 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
  18         [18.7.68.37])\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 B883C431FC4\r
  22         for <notmuch@notmuchmail.org>; Mon,  4 Aug 2014 18:29:53 -0700 (PDT)\r
  23 X-AuditID: 12074425-f79766d000006da8-55-53e03390c3e8\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-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 47.6A.28072.09330E35; Mon,  4 Aug 2014 21:29:52 -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 s751To6X018138; \r
  31         Mon, 4 Aug 2014 21:29:50 -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 s751Tmc7000738\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Mon, 4 Aug 2014 21:29:49 -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 1XETZU-00012f-Ni; Mon, 04 Aug 2014 21:29:48 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH] new: Report and abort on upgrade failure\r
  45 Date: Mon,  4 Aug 2014 21:29:46 -0400\r
  46 Message-Id: <1407202186-3968-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+NgFprFIsWRmVeSWpSXmKPExsUixCmqrDvB+EGwwemXvBbXb85kdmD0eLbq\r
  50         FnMAYxSXTUpqTmZZapG+XQJXxuOL+9gLNvNVbN56kbmB8Rx3FyMnh4SAicSWX1PYIWwxiQv3\r
  51         1rN1MXJxCAnMZpKYcnUqC4SzgVHi2YYFrCBVQgK3mST+rNOFSMxllFjz/SojSIJNQENi2/7l\r
  52         YLaIgLTEzruzgRo4OJgF1CT+dKmAhIUFLCX2Ni0Hm8MioCqx+/83MJtXwF7i87mdrBBXyEk0\r
  53         3PjENoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdC73czBK91JTSTYygIGB3Ud3BOOGQ\r
  54         0iFGAQ5GJR5eAbX7wUKsiWXFlbmHGCU5mJREeUP1HgQL8SXlp1RmJBZnxBeV5qQWH2KU4GBW\r
  55         EuHNFwTK8aYkVlalFuXDpKQ5WJTEed9aWwULCaQnlqRmp6YWpBbBZGU4OJQkeA8bAjUKFqWm\r
  56         p1akZeaUIKSZODhBhvMADT8NUsNbXJCYW5yZDpE/xagoJc7rAZIQAElklObB9cKi9BWjONAr\r
  57         wrwXQKp4gBEO1/0KaDAT0GAznfsgg0sSEVJSDYx72Dbp+Msli3y1Nc/zXLJH4mTxObMU61UW\r
  58         HswR/wVul69IPBSQ0bH2WbTMnrjJM5KSk9T+r3LNva/Cosu7UeSd6J38ZtW/xSef750ltEqT\r
  59         jbVVIC/Y7eah8yEvSn6q6Wy8vd9mfq2T49Mt8buOtjvvOe9w+Vv6g+kKsYWM/ffUeMpc51ft\r
  60         jlJiKc5INNRiLipOBADy0TXSrQIAAA==\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: Tue, 05 Aug 2014 01:29:59 -0000\r
  74 \r
  75 Previously the return status of notmuch_database_upgrade went\r
  76 completely unchecked.\r
  77 ---\r
  78  notmuch-new.c | 15 +++++++++++----\r
  79  1 file changed, 11 insertions(+), 4 deletions(-)\r
  80 \r
  81 diff --git a/notmuch-new.c b/notmuch-new.c\r
  82 index b7590a8..ddf42c1 100644\r
  83 --- a/notmuch-new.c\r
  84 +++ b/notmuch-new.c\r
  85 @@ -923,6 +923,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  86      notmuch_bool_t timer_is_active = FALSE;\r
  87      notmuch_bool_t no_hooks = FALSE;\r
  88      notmuch_bool_t quiet = FALSE, verbose = FALSE;\r
  89 +    notmuch_status_t status;\r
  90  \r
  91      add_files_state.verbosity = VERBOSITY_NORMAL;\r
  92      add_files_state.debug = FALSE;\r
  93 @@ -1019,9 +1020,16 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  94             }\r
  95  \r
  96             gettimeofday (&add_files_state.tv_start, NULL);\r
  97 -           notmuch_database_upgrade (notmuch,\r
  98 -                                     add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
  99 -                                     &add_files_state);\r
 100 +           status = notmuch_database_upgrade (\r
 101 +               notmuch,\r
 102 +               add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
 103 +               &add_files_state);\r
 104 +           if (status) {\r
 105 +               printf ("Upgrade failed: %s\n",\r
 106 +                       notmuch_status_to_string (status));\r
 107 +               notmuch_database_destroy (notmuch);\r
 108 +               return EXIT_FAILURE;\r
 109 +           }\r
 110             if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
 111                 printf ("Your notmuch database has now been upgraded.\n");\r
 112         }\r
 113 @@ -1090,7 +1098,6 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
 114      }\r
 115  \r
 116      for (f = add_files_state.directory_mtimes->head; f && !interrupted; f = f->next) {\r
 117 -       notmuch_status_t status;\r
 118         notmuch_directory_t *directory;\r
 119         status = notmuch_database_get_directory (notmuch, f->filename, &directory);\r
 120         if (status == NOTMUCH_STATUS_SUCCESS && directory) {\r
 121 -- \r
 122 2.0.0\r
 123 \r