* fix some confusion between --reindex and --rebuild (remove the former)

This commit is contained in:
djcb
2013-04-21 23:10:40 +03:00
parent 42807a3a01
commit 094979ab68
4 changed files with 7 additions and 18 deletions

View File

@ -197,7 +197,6 @@ database_version_check_and_update (MuStore *store, MuConfig *opts,
/* when rebuilding, we empty the database before doing
* anything */
if (opts->rebuild) {
opts->reindex = TRUE;
g_debug ("clearing database");
g_debug ("clearing contacts-cache");
return mu_store_clear (store, err);
@ -208,7 +207,6 @@ database_version_check_and_update (MuStore *store, MuConfig *opts,
/* ok, database is not up to date */
if (opts->autoupgrade) {
opts->reindex = TRUE;
g_debug ("auto-upgrade: clearing old database and cache");
return mu_store_clear (store, err);
}
@ -319,7 +317,7 @@ cmd_index (MuIndex *midx, MuConfig *opts, MuIndexStats *stats, GError **err)
show_progress = !opts->quiet && isatty(fileno(stdout));
idata.color = !opts->nocolor;
newline_before_on();
rv = mu_index_run (midx, opts->maildir, opts->reindex, stats,
rv = mu_index_run (midx, opts->maildir, opts->rebuild, stats,
show_progress ?
(MuIndexMsgCallback)index_msg_cb :
(MuIndexMsgCallback)index_msg_silent_cb,