---
notmuch-client.h | 1 +
notmuch.c | 29 ++++++++++++++++++++++++++---
test/T030-config.sh | 11 +++++++----
test/T590-libconfig.sh | 3 ---
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index f60f5406..db88daf8 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -258,6 +258,7 @@ typedef enum {
NOTMUCH_COMMAND_DATABASE_EARLY = 1 << 2,
NOTMUCH_COMMAND_DATABASE_WRITE = 1 << 3,
NOTMUCH_COMMAND_DATABASE_CREATE = 1 << 4,
+ NOTMUCH_COMMAND_CONFIG_LOAD = 1 << 5,
} notmuch_command_mode_t;
notmuch_config_t *
diff --git a/notmuch.c b/notmuch.c
index a161f127..90504d37 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -168,7 +168,7 @@ static command_t commands[] = {
"Compact the notmuch database." },
{ "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY |
NOTMUCH_COMMAND_DATABASE_WRITE,
"Re-index all messages matching the search terms." },
- { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN,
+ { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN |
NOTMUCH_COMMAND_CONFIG_LOAD,
"Get or set settings in the notmuch configuration file." },
#if WITH_EMACS
{ "emacs-mua", NULL, 0,
@@ -460,7 +460,7 @@ main (int argc, char *argv[])
notmuch_config_t *config = NULL;
notmuch_database_t *notmuch = NULL;
int opt_index;
- int ret;
+ int ret = EXIT_SUCCESS;
notmuch_opt_desc_t options[] = {
{ .opt_string = &config_file_name, .name = "config" },
@@ -548,7 +548,30 @@ main (int argc, char *argv[])
return EXIT_FAILURE;
}
}
- } else {
+ }
+
+ if (command->mode & NOTMUCH_COMMAND_CONFIG_LOAD) {
+ char *status_string = NULL;
+ notmuch_status_t status;
+ status = notmuch_database_load_config (NULL,
+ config_file_name,
+ NULL,
+ ¬much,
+ &status_string);
+ if (status) {
+ if (status_string) {
+ fputs (status_string, stderr);
+ free (status_string);
+ }
+
+ if (status == NOTMUCH_STATUS_NO_CONFIG)
+ fputs ("Try running 'notmuch setup' to create a
configuration.", stderr);
+ goto DONE;
+ }
+
+ }
+
+ if (command->mode & NOTMUCH_COMMAND_CONFIG_OPEN) {
config = notmuch_config_open (local, config_file_name, command->mode);
if (! config) {
ret = EXIT_FAILURE;
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 67c9545c..14d1f4f2 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -96,14 +96,17 @@ test_expect_equal "$(notmuch --config=alt-config-link
config get user.name)" \
test_begin_subtest "Writing config file through symlink follows symlink"
test_expect_equal "$(readlink alt-config-link)" "alt-config"
+db_path=${HOME}/database-path
+
test_begin_subtest "Absolute database path returned"
-notmuch config set database.path ${HOME}/Maildir
+mkdir -p ${db_path}
+notmuch config set database.path ${db_path}
test_expect_equal "$(notmuch config get database.path)" \
- "${HOME}/Maildir"
+ "${db_path}"
test_begin_subtest "Relative database path properly expanded"
-notmuch config set database.path Maildir
+notmuch config set database.path ${db_path}
test_expect_equal "$(notmuch config get database.path)" \
- "${HOME}/Maildir"
+ "${db_path}"
test_done
diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 01a9ac06..cf294d04 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -626,9 +626,6 @@ EOF
test_begin_subtest "notmuch_database_get_config (ndlc)"
-echo NOTMUCH_CONFIG=$NOTMUCH_CONFIG
-echo NOTMUCH_PROFILE=$NOTMUCH_PROFILE
-echo HOME=$HOME
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
{
EXPECT0(notmuch_database_get_config (db, "test.key1", &val));
--
2.30.0
_______________________________________________
notmuch mailing list -- [email protected]
To unsubscribe send an email to [email protected]
