aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2021-07-18 14:58:22 -0300
committerDavid Bremner <david@tethera.net>2021-08-17 17:09:56 -0700
commit686230712f3865ac0d0250084113d6d859cc2519 (patch)
treed489210e7ccfb117c429cd34375f77067fbacff8
parent202dde04e1057d0ab06a4e11f059f9ed2c6a717f (diff)
CLI/config: restore "notmuch config get built_with.*"
We need to special case the config section "built_with" because it is not (currently) handled by the library. This seems consist with the other sub-sub-commands 'list' and 'set'.
-rw-r--r--notmuch-config.c17
-rwxr-xr-xtest/T030-config.sh2
2 files changed, 12 insertions, 7 deletions
diff --git a/notmuch-config.c b/notmuch-config.c
index d9390c4d..e5b4db45 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -538,11 +538,18 @@ notmuch_config_command_get (notmuch_database_t *notmuch, char *item)
{
notmuch_config_values_t *list;
- for (list = notmuch_config_get_values_string (notmuch, item);
- notmuch_config_values_valid (list);
- notmuch_config_values_move_to_next (list)) {
- const char *val = notmuch_config_values_get (list);
- puts (val);
+ if (STRNCMP_LITERAL (item, BUILT_WITH_PREFIX) == 0) {
+ if (notmuch_built_with (item + strlen (BUILT_WITH_PREFIX)))
+ puts ("true");
+ else
+ puts ("false");
+ } else {
+ for (list = notmuch_config_get_values_string (notmuch, item);
+ notmuch_config_values_valid (list);
+ notmuch_config_values_move_to_next (list)) {
+ const char *val = notmuch_config_values_get (list);
+ puts (val);
+ }
}
return EXIT_SUCCESS;
}
diff --git a/test/T030-config.sh b/test/T030-config.sh
index bc9904b8..f8897471 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -148,7 +148,6 @@ test_begin_subtest "set built_with.* yields error"
test_expect_code 1 "notmuch config set built_with.compact false"
test_begin_subtest "get built_with.{compact,field_processor} prints true"
-test_subtest_known_broken
for key in compact field_processor; do
notmuch config get built_with.${key}
done > OUTPUT
@@ -159,7 +158,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "get built_with.nonexistent prints false"
-test_subtest_known_broken
output=$(notmuch config get built_with.nonexistent)
test_expect_equal "$output" "false"