Merge tag '0.38.1_pre0'

notmuch 0.38.1~pre0 release

diff --git a/.gitignore b/.gitignore
index f94d1480c1f91d5ff64e8a0f746f4f79de19b839..eda6d9cff7473613aca1e36d54fb4dd5e8872a2c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /bindings/python-cffi/_notmuch_config.py
 TAGS
 tags
+__pycache__

diff --git a/devel/notmuch-web/nmweb.py b/devel/notmuch-web/nmweb.py
index b0d4d5cd49dd461924e37be80fc196a47fc9edd4..e0e87b49b2ca2c0de3fc29a36e58fd498841c960 100755 (executable)
--- a/devel/notmuch-web/nmweb.py
+++ b/devel/notmuch-web/nmweb.py
@@ -207,7 +207,7 @@ env.globals['thread_nav'] = thread_nav
 
 def format_message(nm_msg, mid):
   fn = list(nm_msg.filenames())[0]
-  msg = MaildirMessage(open(fn))
+  msg = MaildirMessage(open(fn, 'rb'))
   return format_message_walk(msg, mid)
 
 def decodeAnyway(txt, charset='ascii'):

diff --git a/test/T810-tsan.suppressions b/test/T810-tsan.suppressions
index dbd16a94971134c7f675debdfc741f15f2c7abeb..80dc062ff7b34e58f5b3b392a45b0c0024144ff1 100644 (file)
--- a/test/T810-tsan.suppressions
+++ b/test/T810-tsan.suppressions
@@ -1,5 +1,3 @@
 # It's unclear how TSan-friendly GLib is:
 # https://gitlab.gnome.org/GNOME/glib/-/issues/1672
-race:g_rw_lock_reader_lock
-# https://gitlab.gnome.org/GNOME/glib/-/issues/1952
-race:g_slice_alloc0
+called_from_lib:libglib*.so