debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/n_d_needs_upgrade: handle error return from n_d_get_version

Browse source 
Also clarify documentation of error return from n_d_needs_upgrade.
This commit is contained in:
David Bremner 2020-07-16 19:28:22 -03:00
parent cf90431cbf
commit f25fc8e211
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/database.cc
View file

@ -1395,9 +1395,17 @@ notmuch_database_get_version (notmuch_database_t *notmuch)
notmuch_bool_t notmuch_bool_t
notmuch_database_needs_upgrade (notmuch_database_t *notmuch) notmuch_database_needs_upgrade (notmuch_database_t *notmuch)
{ {
return notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE && unsigned int version;
((NOTMUCH_FEATURES_CURRENT & ~notmuch->features) ||
(notmuch_database_get_version (notmuch) < NOTMUCH_DATABASE_VERSION)); if (notmuch->mode != NOTMUCH_DATABASE_MODE_READ_WRITE)
return FALSE;
if (NOTMUCH_FEATURES_CURRENT & ~notmuch->features)
return TRUE;
version = notmuch_database_get_version (notmuch);
return (version > 0 && version < NOTMUCH_DATABASE_VERSION);
} }
static volatile sig_atomic_t do_progress_notify = 0; static volatile sig_atomic_t do_progress_notify = 0;

2
lib/notmuch.h
View file

@ -447,6 +447,8 @@ notmuch_database_get_version (notmuch_database_t *database);
* FALSE for a read-only database because there's no way to upgrade a * FALSE for a read-only database because there's no way to upgrade a
* read-only database. * read-only database.
* *
* Also returns FALSE if an error occurs accessing the database.
*
*/ */
notmuch_bool_t notmuch_bool_t
notmuch_database_needs_upgrade (notmuch_database_t *database); notmuch_database_needs_upgrade (notmuch_database_t *database);

1
test/T562-lib-database.sh
View file

@ -132,7 +132,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "check a closed db for upgrade" test_begin_subtest "check a closed db for upgrade"
test_subtest_known_broken
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_bool_t ret; notmuch_bool_t ret;