Merge from sid [dgit]

diff --git a/NEWS b/NEWS
index 315f41360bd66038e461f0337d0062b56d2597f6..a064671f610f9bdffed130f0289e1d552b7e157b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Notmuch 0.38.3 (2024-03-09)
+===========================
+
+CLI
+---
+
+Fix a bug in configuration code that caused the notmuch command to
+erroneously report "Error: could not locate database" under some
+circumstances.
+
 Notmuch 0.38.2 (2023-12-01)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index f4fd171d016706faf2af4d686221ab7688dab0a6..fd4152eef9ca772fff115b70860f8fb506c21ab0 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.38.2'
+__VERSION__ = '0.38.3'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index a909b9d8e4c9d292a7cd96d584ff00a257edb714..447da3b7fa67e3f8640cf78a1b628f1493156a39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.38.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+  * Bug fix: "Recommends transitional package gnupg-agent instead of
+    gpg-agent", thanks to Andreas Metzler (Closes: #1064114).
+
+ -- David Bremner <bremner@debian.org>  Sat, 17 Feb 2024 09:03:50 -0400
+
 notmuch (0.38.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index 26871bc24015e724d8006eb67cf597ee571dfd8e..4fded909a03ca5d4910c2cc8f1fee4f03795ebbe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
- gnupg-agent,
+ gpg-agent,
  gpgsm,
 Suggests:
  mailscripts,

diff --git a/doc/conf.py b/doc/conf.py
index 7ac13a5d7fb5dc71de4caa824e11feefce090409..ee1b336af2ad61d36336c5891b821cf201915560 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -16,7 +16,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'notmuch'
-copyright = u'2009-2023, Carl Worth and many others'
+copyright = u'2009-2024, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 

diff --git a/lib/open.cc b/lib/open.cc
index 005872dc2c5877d5f0ac483b0ef2cec19b2ca85c..463e38bf0d8f733fe933da033ab993d828255fb7 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -249,6 +249,11 @@ _choose_database_path (notmuch_database_t *notmuch,
        return NOTMUCH_STATUS_NO_DATABASE;
     }
 
+    if (*message) {
+       free (*message);
+       *message = NULL;
+    }
+
     return NOTMUCH_STATUS_SUCCESS;
 }
 

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index efc79e8b089ddcb4abe107136c8412f4e89c5f01..1feb5624c41b8af06fab0750f7bc70395b7a4504 100755 (executable)
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -374,6 +374,11 @@ EOF
           notmuch new
           test_expect_equal "$(xapian-metadata get ${XAPIAN_PATH} version)" 3
           ;;
+       home_mail|maildir_env)
+          test_begin_subtest "No errors from config list ($config)"
+          notmuch config list 2>OUTPUT 1>/dev/null
+          test_expect_equal_file /dev/null OUTPUT
+          ;;
        *)
           backup_database
           test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"

diff --git a/version.txt b/version.txt
index f2e78d495a04faa6e6838ebbec69daf395772e43..f2687f32e8878bb36f76e6cb14a4b09169e25f8b 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.38.2
+0.38.3