From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yDDKD9UKCGGQ7gAAgWs5BA (envelope-from ) for ; Mon, 02 Aug 2021 17:10:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KCuNC9UKCGE0BwAA1q6Kng (envelope-from ) for ; Mon, 02 Aug 2021 15:10:13 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B56772C759 for ; Mon, 2 Aug 2021 17:10:12 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A96A62C075; Mon, 2 Aug 2021 11:09:48 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 5CB172C049 for ; Mon, 2 Aug 2021 11:09:37 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 55E7F5FD5C; Mon, 2 Aug 2021 11:09:37 -0400 (EDT) Received: (nullmailer pid 3234758 invoked by uid 1000); Mon, 02 Aug 2021 15:09:30 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 7/8] lib/open: look in MAILDIR for database, as documented. Date: Mon, 2 Aug 2021 12:09:21 -0300 Message-Id: <20210802150922.3234616-8-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210802150922.3234616-1-david@tethera.net> References: <87bl9lx864.fsf@kisara.moe> <20210802150922.3234616-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 2M4IU7YSRNHZA7MKT36GL4N3XUQW3B35 X-Message-ID-Hash: 2M4IU7YSRNHZA7MKT36GL4N3XUQW3B35 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627917012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1IJWK0+lONMTDV9+BZ7QFk2CSPooKx1r1GPD02BXcDY=; b=KtYYjEEI3vD91SAogqW+yLEIMbRrCXvgCW5F7P2gIIQTS249CYXFfJxplz+ZvSx1T5pe6o qy1kCRWUZWGUEnIjT7/Kk2H9WE1ukDL2K+NtNji4CBWRjzbeQ+b6oy42x+jeOF2O/py4Gj 3IRxt5iXSWwylti+1vD0OKAhViGXIEMW2/TsELQGxGGGbTinwlxdfv6kJ8krkfahex2qbJ RjyKHFKmRHQDJ1WKM0gZ1l/iXpo0OHudVVwp+3941tepRKi81wtv+qRi5fzex24Veyl3GH rhhKxyOOXIk1o6nLleNuIvl+hvrdbe889Ioj80RVXJQjNRIozsojpB/EKDMNRA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627917012; a=rsa-sha256; cv=none; b=NKfPKt7Ta7Cg3Ys23AKqZ2snGWxlXemNESOc26SwcvzeeHwi6ShlyyU4aimZl4TAIlEaSL Fivq6PxIEQV6CoUjFkODkDe/HD+RQ+goiDi++Zf5zzR39pNQln6pwEXJ13FkjPOlYbFgNX Z7V/GajkKDbCJILgCyOwIW7j92LvdsVG4Yvh8kcGWdeX2i8/RatS+5dTXfY3fEXSs4rTJW iKICjSXWNF64KkjcNWQN1fYk8x+qx75zAaYYeNxwAqibXiIaApzNUy35nUz84R+2yMvfX9 N5jpEZtY3Gs6QsAOIB1VCm/mDlsc9rv+8oDK73V1ECF+jTjVV3F4bpcV/c4ZJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.49 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: B56772C759 X-Spam-Score: 0.49 X-Migadu-Scanner: scn0.migadu.com X-TUID: sa4iyGvDUM1K This fixes the bug id:87bl9lx864.fsf@kisara.moe --- lib/open.cc | 4 ++++ test/T055-path-config.sh | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index 7b95c5b1..280ffee3 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -220,6 +220,10 @@ _choose_database_path (void *ctx, } } + if (! *database_path) { + *database_path = getenv ("MAILDIR"); + } + if (! *database_path) { notmuch_status_t status; diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 40601acd..774fe9c8 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -97,9 +97,6 @@ config_subtest () { local config=$2 test_begin_subtest "$title ($config)" - if [[ "$config" == "maildir_env" ]]; then - test_subtest_known_broken - fi } for config in traditional split XDG XDG+profile symlink home_mail maildir_env; do -- 2.30.2