X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-config.c;h=cc05f6c414971019b9d799cd3fc81874079a57b4;hb=f41a35e2923b0b3ef2f66e91cd30e20b4c1a336a;hp=95430db104fce8583ac089f9a3e83f52c08901b0;hpb=e72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d;p=notmuch

diff --git a/notmuch-config.c b/notmuch-config.c
index 95430db1..cc05f6c4 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -186,7 +186,6 @@ notmuch_config_open (void *ctx,
 	config->filename = talloc_strdup (config, filename);
     } else if ((notmuch_config_env = getenv ("NOTMUCH_CONFIG"))) {
 	config->filename = talloc_strdup (config, notmuch_config_env);
-	notmuch_config_env = NULL;
     } else {
 	config->filename = talloc_asprintf (config, "%s/.notmuch-config",
 					    getenv ("HOME"));
@@ -206,8 +205,12 @@ notmuch_config_open (void *ctx,
 				     &error))
     {
 	/* We are capable of dealing with a non-existent configuration
-	 * file, so be silent about that. */
-	if (!(error->domain == G_FILE_ERROR &&
+	 * file, so be silent about that (unless the user had set a
+	 * non-default configuration file with the NOTMUCH_CONFIG
+	 * variable)
+	 */
+	if (notmuch_config_env ||
+	    !(error->domain == G_FILE_ERROR &&
 	      error->code == G_FILE_ERROR_NOENT))
 	{
 	    fprintf (stderr, "Error reading configuration file %s: %s\n",