alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu_store_needs_upgrade --> mu_store_versions_match

Browse Source
This commit is contained in:
djcb
2013-01-06 15:53:42 +02:00
parent e8f4f5976d
commit f5f8d6de70
9 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mu/mu-cmd-find.c
View File

@ -234,9 +234,9 @@ get_query_obj (MuStore *store, GError **err)
return NULL;
}
if (mu_store_needs_upgrade (store)) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NOT_UP_TO_DATE,
"the database is not up-to-date");
if (!mu_store_versions_match (store)) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_VERSION_MISMATCH,
"the database needs a rebuild");
return NULL;
}

2
mu/mu-cmd-index.c
View File

@ -203,7 +203,7 @@ database_version_check_and_update (MuStore *store, MuConfig *opts,
return mu_store_clear (store, err);
}
if (!mu_store_needs_upgrade (store))
if (mu_store_versions_match (store))
return TRUE; /* ok, nothing to do */
/* ok, database is not up to date */

4
mu/mu.cc
View File

@ -59,8 +59,8 @@ handle_error (MuConfig *conf, MuError merr, GError **err)
g_printerr ("maybe mu is already running?\n");
break;
case MU_ERROR_XAPIAN_CORRUPTION:
case MU_ERROR_XAPIAN_NOT_UP_TO_DATE:
g_printerr ("database needs update; "
case MU_ERROR_XAPIAN_VERSION_MISMATCH:
g_printerr ("database needs a rebuild; "
"try 'mu index --rebuild'\n");
break;
case MU_ERROR_XAPIAN_IS_EMPTY: