debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2021-12-29 14:20:49 -04:00
commit 3eb25c94bd
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -55,6 +55,8 @@ subdirs="${subdirs} bindings"
# the directory structure and copy Makefiles. # the directory structure and copy Makefiles.
if [ "$srcdir" != "." ]; then if [ "$srcdir" != "." ]; then
NOTMUCH_BUILDDIR=$PWD
for dir in . ${subdirs}; do for dir in . ${subdirs}; do
mkdir -p "$dir" mkdir -p "$dir"
cp "$srcdir"/"$dir"/Makefile.local "$dir" cp "$srcdir"/"$dir"/Makefile.local "$dir"
@ -78,6 +80,8 @@ if [ "$srcdir" != "." ]; then
"$srcdir"/bindings/python-cffi/notmuch2 \ "$srcdir"/bindings/python-cffi/notmuch2 \
"$srcdir"/bindings/python-cffi/setup.py \ "$srcdir"/bindings/python-cffi/setup.py \
bindings/python-cffi/ bindings/python-cffi/
else
NOTMUCH_BUILDDIR=$NOTMUCH_SRCDIR
fi fi
# Set several defaults (optionally specified by the user in # Set several defaults (optionally specified by the user in
@ -1247,6 +1251,7 @@ cat > Makefile.config <<EOF
# directory (the current directory at the time configure was run). # directory (the current directory at the time configure was run).
srcdir = ${srcdir} srcdir = ${srcdir}
NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR} NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR}
NOTMUCH_BUILDDIR = ${NOTMUCH_BUILDDIR}
# subdirectories to build # subdirectories to build
subdirs = ${subdirs} subdirs = ${subdirs}

8
lib/open.cc
View file

@ -661,16 +661,12 @@ notmuch_database_create_with_config (const char *database_path,
err = mkdir (notmuch_path, 0755); err = mkdir (notmuch_path, 0755);
if (err) { if (err) {
if (errno == EEXIST) { if (errno != EEXIST) {
status = NOTMUCH_STATUS_DATABASE_EXISTS;
talloc_free (notmuch);
notmuch = NULL;
} else {
IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n", IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
notmuch_path, strerror (errno))); notmuch_path, strerror (errno)));
status = NOTMUCH_STATUS_FILE_ERROR; status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
} }
goto DONE;
} }
} }

9
test/T055-path-config.sh
View file

@ -318,7 +318,14 @@ to=m.header('To')
print(to) print(to)
EOF EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
;& # fall through ;;
*)
backup_database
test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"
rm -r $XAPIAN_PATH
test_expect_success "notmuch new"
restore_database
;;
esac esac
case $config in case $config in