notmuch_database_get_version previously returned 0 on some errors, but did not document this. Luckily 0 is not a valid database version. --- lib/database.cc | 19 ++++++++++++++++++- lib/notmuch.h | 3 +++ test/T562-lib-database.sh | 1 - 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index cfb19ccb..27861970 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -58,6 +58,17 @@ typedef struct { #define DB_ACTION Xapian::DB_CREATE_OR_OPEN #endif +#define LOG_XAPIAN_EXCEPTION(message, error) _log_xapian_exception (__location__, message, error) + +static void +_log_xapian_exception (const char *where, notmuch_database_t *notmuch, const Xapian::Error error) { + _notmuch_database_log (notmuch, + "A Xapian exception occurred %s accessing %s : %s\n", + where, + error.get_msg ().c_str ()); + notmuch->exception_reported = true; +} + /* Here's the current schema for our database (for NOTMUCH_DATABASE_VERSION): * * We currently have three different types of documents (mail, ghost, @@ -1360,7 +1371,13 @@ notmuch_database_get_version (notmuch_database_t *notmuch) const char *str; char *end; - version_string = notmuch->xapian_db->get_metadata ("version"); + try { + version_string = notmuch->xapian_db->get_metadata ("version"); + } catch (const Xapian::Error &error) { + LOG_XAPIAN_EXCEPTION (notmuch, error); + return 0; + } + if (version_string.empty ()) return 0; diff --git a/lib/notmuch.h b/lib/notmuch.h index 97ebc17d..7ee0507a 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -431,6 +431,8 @@ notmuch_database_get_path (notmuch_database_t *database); /** * Return the database format version of the given database. + * + * @retval 0 on error */ unsigned int notmuch_database_get_version (notmuch_database_t *database); @@ -444,6 +446,7 @@ notmuch_database_get_version (notmuch_database_t *database); * fail with NOTMUCH_STATUS_UPGRADE_REQUIRED. This always returns * FALSE for a read-only database because there's no way to upgrade a * read-only database. + * */ notmuch_bool_t notmuch_database_needs_upgrade (notmuch_database_t *database); diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh index b8fba7d6..c9705b13 100755 --- a/test/T562-lib-database.sh +++ b/test/T562-lib-database.sh @@ -68,7 +68,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "get version with closed db" -test_subtest_known_broken cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} { unsigned int version; -- 2.27.0 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org