From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 2/2] CLI/config: restore "notmuch config get built_with.*"
Date: Sun, 18 Jul 2021 14:58:22 -0300 [thread overview]
Message-ID: <20210718175822.4056051-2-david@tethera.net> (raw)
In-Reply-To: <20210718175822.4056051-1-david@tethera.net>
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'.
---
notmuch-config.c | 17 ++++++++++++-----
test/T030-config.sh | 2 --
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/notmuch-config.c b/notmuch-config.c
index 3430a3d3..4de55e5f 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 3c1955bb..636c6356 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -149,7 +149,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
@@ -160,7 +159,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"
--
2.30.2
prev parent reply other threads:[~2021-07-18 17:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-18 17:58 [PATCH 1/2] test/config: add tests for built_with David Bremner
2021-07-18 17:58 ` David Bremner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210718175822.4056051-2-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
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).