[PATCH] notmuch.c: add missing trailing newlines in two error messages

[PATCH] notmuch.c: add missing trailing newlines in two error messages

[Tomi Ollila]

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,
 					       &notmuch,
 					       &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

Re: [PATCH] notmuch.c: add missing trailing newlines in two error messages

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> 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

LGTM.

Re: [PATCH] notmuch.c: add missing trailing newlines in two error messages

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> 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).

applied to master.

d