1 Return-Path: <jrollins@finestructure.net>
\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 74095431FC4
\r
6 for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:32 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 Received: from olra.theworths.org ([127.0.0.1])
\r
9 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
10 with ESMTP id S95sWqoc0-k8 for <notmuch@notmuchmail.org>;
\r
11 Sun, 22 Nov 2009 13:58:31 -0800 (PST)
\r
12 X-Greylist: delayed 105285 seconds by postgrey-1.32 at olra;
\r
13 Sun, 22 Nov 2009 13:58:31 PST
\r
14 Received: from tarap.cc.columbia.edu (tarap.cc.columbia.edu [128.59.29.7])
\r
15 by olra.theworths.org (Postfix) with ESMTP id A88B2431FAE
\r
16 for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:31 -0800 (PST)
\r
17 Received: from servo.finestructure.net (cpe-72-227-128-66.nyc.res.rr.com
\r
19 (user=jgr2110 author=jrollins@finestructure.net mech=PLAIN bits=0)
\r
20 by tarap.cc.columbia.edu (8.14.3/8.14.3) with ESMTP id nAMLwUTn009370
\r
21 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)
\r
22 for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 16:58:31 -0500 (EST)
\r
23 Received: from jrollins by servo.finestructure.net with local (Exim 4.69)
\r
24 (envelope-from <jrollins@finestructure.net>)
\r
25 id 1NCKSE-0000Gt-IZ; Sun, 22 Nov 2009 16:58:46 -0500
\r
26 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Date: Sun, 22 Nov 2009 16:58:35 -0500
\r
29 Message-Id: <1258927116-528-2-git-send-email-jrollins@finestructure.net>
\r
30 X-Mailer: git-send-email 1.6.5
\r
31 In-Reply-To: <1258927116-528-1-git-send-email-jrollins@finestructure.net>
\r
32 References: <1258927116-528-1-git-send-email-jrollins@finestructure.net>
\r
33 X-No-Spam-Score: Local
\r
34 X-Scanned-By: MIMEDefang 2.65 on 128.59.29.7
\r
35 Subject: [notmuch] [PATCH 2/3] modify notmuch_setup_command to return 1 if
\r
36 config file write fails.
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.12
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Sun, 22 Nov 2009 21:58:32 -0000
\r
51 This fixes a small bug in notmuch_setup_command such that it returned
\r
52 OK and output the setup message footer even if the config file write
\r
55 notmuch-setup.c | 13 +++++++------
\r
56 1 files changed, 7 insertions(+), 6 deletions(-)
\r
58 diff --git a/notmuch-setup.c b/notmuch-setup.c
\r
59 index 482efd2..68788e1 100644
\r
60 --- a/notmuch-setup.c
\r
61 +++ b/notmuch-setup.c
\r
62 @@ -155,10 +155,11 @@ notmuch_setup_command (unused (void *ctx),
\r
63 notmuch_config_set_database_path (config, absolute_path);
\r
66 - notmuch_config_save (config);
\r
69 - welcome_message_post_setup ();
\r
72 + if (! notmuch_config_save (config)) {
\r
74 + welcome_message_post_setup ();
\r