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'.
This commit is contained in:
David Bremner 2021-07-18 14:58:22 -03:00
parent 202dde04e1
commit 686230712f
2 changed files with 12 additions and 7 deletions

View file

@ -538,11 +538,18 @@ notmuch_config_command_get (notmuch_database_t *notmuch, char *item)
{ {
notmuch_config_values_t *list; notmuch_config_values_t *list;
for (list = notmuch_config_get_values_string (notmuch, item); if (STRNCMP_LITERAL (item, BUILT_WITH_PREFIX) == 0) {
notmuch_config_values_valid (list); if (notmuch_built_with (item + strlen (BUILT_WITH_PREFIX)))
notmuch_config_values_move_to_next (list)) { puts ("true");
const char *val = notmuch_config_values_get (list); else
puts (val); 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; return EXIT_SUCCESS;
} }

View file

@ -148,7 +148,6 @@ test_begin_subtest "set built_with.* yields error"
test_expect_code 1 "notmuch config set built_with.compact false" test_expect_code 1 "notmuch config set built_with.compact false"
test_begin_subtest "get built_with.{compact,field_processor} prints true" test_begin_subtest "get built_with.{compact,field_processor} prints true"
test_subtest_known_broken
for key in compact field_processor; do for key in compact field_processor; do
notmuch config get built_with.${key} notmuch config get built_with.${key}
done > OUTPUT done > OUTPUT
@ -159,7 +158,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "get built_with.nonexistent prints false" test_begin_subtest "get built_with.nonexistent prints false"
test_subtest_known_broken
output=$(notmuch config get built_with.nonexistent) output=$(notmuch config get built_with.nonexistent)
test_expect_equal "$output" "false" test_expect_equal "$output" "false"