[PATCH v2 08/11] cli: return error status if compaction fails
[notmuch-archives.git] / c3 / b7c251abf9145349c3effa73314a4e13e05862
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 1DACC431FCB\r
6         for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:25:49 -0800 (PST)\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
9 X-Spam-Flag: NO\r
10 X-Spam-Score: -0.7\r
11 X-Spam-Level: \r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
14 Received: from olra.theworths.org ([127.0.0.1])\r
15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
16         with ESMTP id JJWFDKmXd8Uj for <notmuch@notmuchmail.org>;\r
17         Sun,  3 Nov 2013 04:25:42 -0800 (PST)\r
18 Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
19  [74.125.83.49])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
20  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
21  11D92429E39    for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:25:15 -0800\r
22  (PST)\r
23 Received: by mail-ee0-f49.google.com with SMTP id e52so577701eek.22\r
24         for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:25:14 -0800 (PST)\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
26         d=1e100.net; s=20130820;\r
27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
28         :references:in-reply-to:references;\r
29         bh=uvppT5gjiULeS+rtIXFQc9/UaUBvqAaXg+Y2xkiUH4M=;\r
30         b=ZPW2i/+UazM3SLvvluGSdD0grcmHWXOhdyjdZsnIshzH3NQqT3IMUmz2YwX3SbRqSj\r
31         Pk7jyHVGmBQPXracBqRkEo9Oy1ulHb8spnOkAJh/Yen7F96KjA/5DXMdVHvtK9/5csDq\r
32         LK5rtNXVC57QeFBE5lfx9J7TMl1axy5sj9EiIEpmFNOalNw76cT6GiJKcQCyLPnps5DJ\r
33         BY4kbY+M/SEqC/Heyrg2WmV7D3kcPlaXz4PAFn1cGWRffvaabGynmjavDX0z6rnURZ+3\r
34         vMfeZF3j4c2nx3nR39TTr7FO91OFFG38k8SYKeXEl4K+YvLVnuy//whcVlAJXE/0aUJG\r
35         mwuQ==\r
36 X-Gm-Message-State:\r
37  ALoCoQmtRm7AbN5v/pMjPKAjjKeAfwc62dmtEG8L7hqF3/QOh7pb10oSW4WZUB6QGRiN9EDS+bP7\r
38 X-Received: by 10.15.74.197 with SMTP id j45mr2289244eey.40.1383481514911;\r
39         Sun, 03 Nov 2013 04:25:14 -0800 (PST)\r
40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
41         [88.195.111.91])\r
42         by mx.google.com with ESMTPSA id 8sm1249322eem.15.2013.11.03.04.25.13\r
43         for <multiple recipients>\r
44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
45         Sun, 03 Nov 2013 04:25:14 -0800 (PST)\r
46 From: Jani Nikula <jani@nikula.org>\r
47 To: notmuch@notmuchmail.org\r
48 Subject: [PATCH v2 08/11] cli: return error status if compaction fails\r
49 Date: Sun,  3 Nov 2013 14:24:48 +0200\r
50 Message-Id:\r
51  <4424dd938a50a031b36c439db129eebbe8366484.1383481295.git.jani@nikula.org>\r
52 X-Mailer: git-send-email 1.8.4.rc3\r
53 In-Reply-To: <cover.1383481295.git.jani@nikula.org>\r
54 References: <cover.1383481295.git.jani@nikula.org>\r
55 In-Reply-To: <cover.1383481295.git.jani@nikula.org>\r
56 References: <cover.1383481295.git.jani@nikula.org>\r
57 X-BeenThere: notmuch@notmuchmail.org\r
58 X-Mailman-Version: 2.1.13\r
59 Precedence: list\r
60 List-Id: "Use and development of the notmuch mail system."\r
61         <notmuch.notmuchmail.org>\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
65 List-Post: <mailto:notmuch@notmuchmail.org>\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
69 X-List-Received-Date: Sun, 03 Nov 2013 12:25:49 -0000\r
70 \r
71 As is customary for any tool.\r
72 ---\r
73  notmuch-compact.c | 19 ++++++++++---------\r
74  1 file changed, 10 insertions(+), 9 deletions(-)\r
75 \r
76 diff --git a/notmuch-compact.c b/notmuch-compact.c\r
77 index 55dc731..b9461c2 100644\r
78 --- a/notmuch-compact.c\r
79 +++ b/notmuch-compact.c\r
80 @@ -43,16 +43,17 @@ notmuch_compact_command (notmuch_config_t *config,\r
81      ret = notmuch_database_compact (path, backup_path, status_update_cb, NULL);\r
82      if (ret) {\r
83         fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret));\r
84 -    } else {\r
85 -       printf ("\n");\r
86 -       printf ("\n");\r
87 -       printf ("The old database has been moved to %s", backup_path);\r
88 -       printf ("\n");\r
89 -       printf ("To delete run,\n");\r
90 -       printf ("\n");\r
91 -       printf ("    rm -R %s\n", backup_path);\r
92 -       printf ("\n");\r
93 +       return 1;\r
94      }\r
95  \r
96 +    printf ("\n");\r
97 +    printf ("\n");\r
98 +    printf ("The old database has been moved to %s", backup_path);\r
99 +    printf ("\n");\r
100 +    printf ("To delete run,\n");\r
101 +    printf ("\n");\r
102 +    printf ("    rm -R %s\n", backup_path);\r
103 +    printf ("\n");\r
104 +\r
105      return 0;\r
106  }\r
107 -- \r
108 1.8.4.rc3\r
109 \r