unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] notmuch.c: add missing trailing newlines in two error messages
@ 2022-07-31 17:32 Tomi Ollila
  2022-07-31 18:57 ` David Bremner
  2022-08-01  0:06 ` David Bremner
  0 siblings, 2 replies; 3+ messages in thread
From: Tomi Ollila @ 2022-07-31 17:32 UTC (permalink / raw)
  To: notmuch; +Cc: 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] notmuch.c: add missing trailing newlines in two error messages
  2022-07-31 17:32 [PATCH] notmuch.c: add missing trailing newlines in two error messages Tomi Ollila
@ 2022-07-31 18:57 ` David Bremner
  2022-08-01  0:06 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2022-07-31 18:57 UTC (permalink / raw)
  To: Tomi Ollila, notmuch; +Cc: tomi.ollila

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] notmuch.c: add missing trailing newlines in two error messages
  2022-07-31 17:32 [PATCH] notmuch.c: add missing trailing newlines in two error messages Tomi Ollila
  2022-07-31 18:57 ` David Bremner
@ 2022-08-01  0:06 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2022-08-01  0:06 UTC (permalink / raw)
  To: Tomi Ollila, notmuch; +Cc: tomi.ollila

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-08-01  0:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-31 17:32 [PATCH] notmuch.c: add missing trailing newlines in two error messages Tomi Ollila
2022-07-31 18:57 ` David Bremner
2022-08-01  0:06 ` David Bremner

Code repositories for project(s) associated with this inbox:

	notmuch.git.git (no URL configured)

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