aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2023-09-15 09:50:02 -0300
committerDavid Bremner <david@tethera.net>2023-09-23 08:26:40 -0300
commitdbb5ff338511bfa6718ed144b95a689809d4bea1 (patch)
tree1cddeb2de90c3823981a1c207a9dd3c8c738f85d
parent112c53535a569ba28a2a7f3baae7fcc4033c65bc (diff)
CLI: exit with error when load_config returns an error.
For now print a generic error message and exit with error on any non-success code. Previously the code exited, but with exit code zero, leading users / scripts to think the command had succeeded.
-rw-r--r--notmuch.c2
-rwxr-xr-xtest/T030-config.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/notmuch.c b/notmuch.c
index 37286b8f..69a18131 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -584,6 +584,8 @@ main (int argc, char *argv[])
case NOTMUCH_STATUS_SUCCESS:
break;
default:
+ fputs ("Error: unable to load config file.\n", stderr);
+ ret = 1;
goto DONE;
}
diff --git a/test/T030-config.sh b/test/T030-config.sh
index c416e781..2d3017da 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -196,7 +196,6 @@ output=$(notmuch config get built_with.nonexistent)
test_expect_equal "$output" "false"
test_begin_subtest "Bad utf8 reported as error"
-test_subtest_known_broken
cp initial-config bad-config
printf '[query]\nq3=from:\xff\n' >>bad-config
test_expect_code 1 "notmuch --config=./bad-config config list"