This matches the heuristic used by "notmuch config set" to decide if
something is a list.
This change fixes the bug reported at [1].
[1]: id:6O3LTUhoXlrnkPWCtPJCP4cagU7mFVEdyTpcC_37BoSzStlARXDBa7oczy6hB0jyjGjBQvgj_jFV58cw0aNx-jUg1h1O-FQ7820k68C0X4M=@protonmail.com
---
notmuch-config.c | 5 ++++-
test/T040-setup.sh | 1 -
test/setup.expected-output/config-with-comments | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/notmuch-config.c b/notmuch-config.c
index 11d8d68b..e9456d79 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -383,7 +383,10 @@ _config_set_list (notmuch_conffile_t *config,
const char *list[],
size_t length)
{
- g_key_file_set_string_list (config->key_file, group, key, list, length);
+ if (length > 1)
+ g_key_file_set_string_list (config->key_file, group, key, list, length);
+ else
+ g_key_file_set_string (config->key_file, group, key, list[0]);
}
void
diff --git a/test/T040-setup.sh b/test/T040-setup.sh
index 36a42562..10b29ec3 100755
--- a/test/T040-setup.sh
+++ b/test/T040-setup.sh
@@ -24,7 +24,6 @@ expected_dir=$NOTMUCH_SRCDIR/test/setup.expected-output
test_expect_equal_file ${expected_dir}/config-with-comments new-notmuch-config
test_begin_subtest "setup consistent with config-set for single items"
-test_subtest_known_broken
# note this relies on the config state from the previous test.
notmuch --config=new-notmuch-config config list > list.setup
notmuch --config=new-notmuch-config config set search.exclude_tags baz
diff --git a/test/setup.expected-output/config-with-comments b/test/setup.expected-output/config-with-comments
index 56c628e5..d8397714 100644
--- a/test/setup.expected-output/config-with-comments
+++ b/test/setup.expected-output/config-with-comments
@@ -31,7 +31,7 @@ path=/path/to/maildir
[user]
name=Test Suite
primary_email=test.suite@example.com
-other_email=another.suite@example.com;
+other_email=another.suite@example.com
# Configuration for "notmuch new"
#
@@ -60,7 +60,7 @@ tags=foo;bar;
# query will override that exclusion.
#
[search]
-exclude_tags=baz;
+exclude_tags=baz
# Maildir compatibility configuration
#
--
2.34.1
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org