From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH] notmuch.c: add missing trailing newlines in two error messages
Date: Sun, 31 Jul 2022 20:32:11 +0300 [thread overview]
Message-ID: <20220731173211.165098-1-tomi.ollila@iki.fi> (raw)
Removed duplicate error check (and the message) in 3rd case where
the same error message (w/o trailing newline) was present.
In case of test/T040-setup.sh, command substitution deletes
trailing newlines, so related test there cannot be changed
(and therefore could not notice this user experience flaw).
---
The current error message can be experienced with
$ NOTMUCH_CONFIG=no-cnfig-thre notmuch new
and (the second change, removed in this commit)
$ NOTMUCH_CONFIG=no-cnfig-thre notmuch config
notmuch.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/notmuch.c b/notmuch.c
index c75b0188..37286b8f 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -531,7 +531,7 @@ main (int argc, char *argv[])
}
if (status == NOTMUCH_STATUS_NO_CONFIG)
- fputs ("Try running 'notmuch setup' to create a configuration.", stderr);
+ fputs ("Try running 'notmuch setup' to create a configuration.\n", stderr);
return EXIT_FAILURE;
}
@@ -563,15 +563,10 @@ main (int argc, char *argv[])
NULL,
¬much,
&status_string);
-
- if (status == NOTMUCH_STATUS_NO_CONFIG && ! (command->mode & NOTMUCH_COMMAND_CONFIG_CREATE)) {
- fputs ("Try running 'notmuch setup' to create a configuration.", stderr);
- goto DONE;
- }
switch (status) {
case NOTMUCH_STATUS_NO_CONFIG:
if (! (command->mode & NOTMUCH_COMMAND_CONFIG_CREATE)) {
- fputs ("Try running 'notmuch setup' to create a configuration.", stderr);
+ fputs ("Try running 'notmuch setup' to create a configuration.\n", stderr);
goto DONE;
}
break;
--
2.34.1
next reply other threads:[~2022-07-31 17:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-31 17:32 Tomi Ollila [this message]
2022-07-31 18:57 ` [PATCH] notmuch.c: add missing trailing newlines in two error messages David Bremner
2022-08-01 0:06 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220731173211.165098-1-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).