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 kIGsKENvCmFJAAEAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 12:43:15 +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 EGtqJENvCmGBEAAA1q6Kng (envelope-from ) for ; Wed, 04 Aug 2021 10:43:15 +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 F2DD3AA58 for ; Wed, 4 Aug 2021 12:43:14 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7789E2C0E6; Wed, 4 Aug 2021 06:42:55 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7F21C2C0C7 for ; Wed, 4 Aug 2021 06:42:47 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3E9B75FD5C; Wed, 4 Aug 2021 06:42:47 -0400 (EDT) Received: (nullmailer pid 3986530 invoked by uid 1000); Wed, 04 Aug 2021 10:42:42 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 6/7] lib/open: look in MAILDIR for database, as documented. Date: Wed, 4 Aug 2021 07:42:35 -0300 Message-Id: <20210804104236.3986362-7-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210804104236.3986362-1-david@tethera.net> References: <20210804104236.3986362-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: IABNPMCUO5KVC5M52I7E3DDOIOV3MN32 X-Message-ID-Hash: IABNPMCUO5KVC5M52I7E3DDOIOV3MN32 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=1628073795; 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=WKcx1+7ugj6DeD5Pveqyx49MtA++Ac2jwfu5XboNFDE=; b=jxF26lGN1kdTbk0hi5bCahdkchJROt5y1wFnzy/2mrLeatF417lvOtyCSxoot4MbYnLisl r1AHFViRwzeQLMG3WumJqgebQyT1sjjhClg2pVAr4iz0RMYX1BBiiPXvexmZe61yukskXZ jbF4d1D/f+8fhNEa1oc36AJFWwSm3WMnnRguR/xotPCiKPP+2b/KmzZx0IPZCVw5ID9Gvh bGmctgPpnNuSjcKSa6LgnT6/c2xClmk55TSI1PArIex+crM9NzWBOzu5D8pImgJDMp3CLm H9ORKUtoQWjy6CidI09UI+GtUcbG/YJD0CFIEc0pAARfCreIEIG1g43iBES9uA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628073795; a=rsa-sha256; cv=none; b=QFR+yUtNrfzRbLbGXB1htPHIXKKH99odyJUflU4rU8lx4fUZruWEF0k9j3YCiKuuhA4n5x sDxD/F7wTuxORTQcqKORu6/gJU9khTat3jMDnZR/D5NUUj/mcX4zIu+3qTbv9JMOfRk0u0 ybSwB6KR0ez0q5e1GHm++9INYde8LVt3vFal7Jq/6OLpEKaMVOtmqwRLuwaf34bc77Jg+K 7AtVRFz9nJdXBsxNDBjKhXnu/Hl84d2VdQvvc41R81tJhqFkLQHmcUVs554I3+mlgN0ltf 1wgxgr4f8HOAMPutfBc+PvsC58k5WSpO1lpsqtwbUUMG4hDFAIp770X6DAhOCQ== 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: -1.02 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: F2DD3AA58 X-Spam-Score: -1.02 X-Migadu-Scanner: scn0.migadu.com X-TUID: LfKnwa28MNDN This fixes the bug id:87bl9lx864.fsf@kisara.moe --- lib/open.cc | 4 ++++ test/T055-path-config.sh | 16 ---------------- 2 files changed, 4 insertions(+), 16 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 4cec8f18..27dd209a 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -125,12 +125,10 @@ for config in traditional split XDG XDG+profile symlink home_mail maildir_env; d esac test_begin_subtest "count ($config)" - [[ "$config" = maildir_env ]] && test_subtest_known_broken output=$(notmuch count '*') test_expect_equal "$output" '52' test_begin_subtest "count+tag ($config)" - [[ "$config" = maildir_env ]] && test_subtest_known_broken tag="tag${RANDOM}" notmuch tag +$tag '*' output=$(notmuch count tag:$tag) @@ -138,7 +136,6 @@ for config in traditional split XDG XDG+profile symlink home_mail maildir_env; d test_expect_equal "$output" '52' test_begin_subtest "address ($config)" - [[ "$config" = maildir_env ]] && test_subtest_known_broken notmuch address --deduplicate=no --sort=newest-first --output=sender --output=recipients path:foo >OUTPUT cat <EXPECTED Carl Worth @@ -147,7 +144,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "dump ($config)" - [[ "$config" = maildir_env ]] && test_subtest_known_broken notmuch dump is:attachment and is:signed | sort > OUTPUT cat < EXPECTED #notmuch-dump batch-tag:3 config,properties,tags @@ -157,7 +153,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "dump + tag + restore ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken notmuch dump '*' > EXPECTED notmuch tag -inbox '*' notmuch restore < EXPECTED @@ -165,26 +160,22 @@ EOF test_expect_equal_file_nonempty EXPECTED OUTPUT test_begin_subtest "reindex ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken notmuch search --output=messages '*' > EXPECTED notmuch reindex '*' notmuch search --output=messages '*' > OUTPUT test_expect_equal_file_nonempty EXPECTED OUTPUT test_begin_subtest "use existing database ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken output=$(notmuch new) test_expect_equal "$output" 'No new mail.' test_begin_subtest "create database ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken rm -rf $DATABASE_PATH/{.notmuch,}/xapian notmuch new output=$(notmuch count '*') test_expect_equal "$output" '52' test_begin_subtest "detect new files ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken generate_message generate_message notmuch new @@ -192,14 +183,12 @@ EOF test_expect_equal "$output" '54' test_begin_subtest "Show a raw message ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken add_message notmuch show --format=raw id:$gen_msg_id > OUTPUT test_expect_equal_file_nonempty $gen_msg_filename OUTPUT rm -f $gen_msg_filename test_begin_subtest "reply ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken add_message '[from]="Sender "' \ [to]=test_suite@notmuchmail.org \ [subject]=notmuch-reply-test \ @@ -219,7 +208,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "insert+search ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken generate_message \ "[subject]=\"insert-subject\"" \ "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \ @@ -230,14 +218,12 @@ EOF test_expect_equal_file_nonempty "$cur_msg_filename" "$gen_msg_filename" test_begin_subtest "compact+search ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken notmuch search --output=messages '*' | sort > EXPECTED notmuch compact notmuch search --output=messages '*' | sort > OUTPUT test_expect_equal_file_nonempty EXPECTED OUTPUT test_begin_subtest "upgrade backup ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative directory paths") xapian-metadata set $XAPIAN_PATH features "$features" output=$(notmuch new | grep Welcome) @@ -271,7 +257,6 @@ EOF test_expect_equal "${output}+${output2}" "${value}+" test_begin_subtest "Set config value in database ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken name=${RANDOM} value=${RANDOM} notmuch config set --database test${test_count}.${name} ${value} @@ -281,7 +266,6 @@ EOF test_expect_equal "${output}+${output2}" "${value}+" test_begin_subtest "Config list ($config)" - [[ "$config" = "maildir_env" ]] && test_subtest_known_broken notmuch config list | notmuch_dir_sanitize | \ sed -e "s/^database.backup_dir=.*$/database.backup_dir/" \ -e "s/^database.hook_dir=.*$/database.hook_dir/" \ -- 2.30.2