debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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).
This commit is contained in:
Tomi Ollila 2022-07-31 20:32:11 +03:00 committed by David Bremner
parent f4ebb60375
commit 54190d091c
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
notmuch.c
View file

@ -531,7 +531,7 @@ main (int argc, char *argv[])
} }
if (status == NOTMUCH_STATUS_NO_CONFIG) 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; return EXIT_FAILURE;
} }
@ -563,15 +563,10 @@ main (int argc, char *argv[])
NULL, NULL,
&notmuch, &notmuch,
&status_string); &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) { switch (status) {
case NOTMUCH_STATUS_NO_CONFIG: case NOTMUCH_STATUS_NO_CONFIG:
if (! (command->mode & NOTMUCH_COMMAND_CONFIG_CREATE)) { 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; goto DONE;
} }
break; break;